diff --git a/30/32/arm_armv7-a-neon/source-based/libEGL.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libEGL.so.lsdump
index 2282700..6745ccf 100644
--- a/30/32/arm_armv7-a-neon/source-based/libEGL.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libEGL.so.lsdump
@@ -2021,15 +2021,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
index 42b858c..c77822d 100644
--- a/30/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
@@ -5892,10 +5892,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26106,24 +26106,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26322,15 +26304,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26340,15 +26313,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26358,15 +26322,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26439,15 +26394,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26457,15 +26403,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26475,15 +26412,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26493,15 +26421,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26511,15 +26430,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26529,15 +26439,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36513,6 +36414,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38056,14 +37966,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38080,14 +37982,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38104,14 +37998,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38120,14 +38006,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38144,14 +38022,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38160,14 +38030,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38176,14 +38038,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38200,14 +38054,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38216,14 +38062,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38240,14 +38078,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39547,7 +39377,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39607,7 +39437,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41391,16 +41221,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43234,11 +43054,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52883,8 +52698,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52893,7 +52714,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54701,74 +54522,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4032,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4480,
+     "field_offset" : 5376,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5472,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54777,7 +54622,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55159,6 +55004,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57742,6 +57641,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57781,6 +57684,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67683,6 +67590,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67722,6 +67633,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68773,6 +68688,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68812,6 +68731,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76689,7 +76612,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
index 5f4a71d..473201b 100644
--- a/30/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
@@ -5928,10 +5928,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26214,24 +26214,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26430,15 +26412,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26448,15 +26421,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26466,15 +26430,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26547,15 +26502,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26565,15 +26511,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26583,15 +26520,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26601,15 +26529,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26619,15 +26538,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26637,15 +26547,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36621,6 +36522,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38164,14 +38074,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38188,14 +38090,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38212,14 +38106,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38228,14 +38114,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38252,14 +38130,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38268,14 +38138,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38284,14 +38146,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38308,14 +38162,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38324,14 +38170,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38348,14 +38186,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39655,7 +39485,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39715,7 +39545,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41499,16 +41329,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43342,11 +43162,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52991,8 +52806,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53001,7 +52822,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54809,74 +54630,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4032,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4480,
+     "field_offset" : 5376,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5472,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54885,7 +54730,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55267,6 +55112,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57850,6 +57749,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57889,6 +57792,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67791,6 +67698,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67830,6 +67741,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68881,6 +68796,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68920,6 +68839,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76797,7 +76720,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
index 549fa2d..b316005 100644
--- a/30/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
@@ -443,7 +443,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -537,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -616,7 +616,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/32/arm_armv7-a-neon/source-based/libandroid.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libandroid.so.lsdump
index 13abbdc..aa487be 100644
--- a/30/32/arm_armv7-a-neon/source-based/libandroid.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libandroid.so.lsdump
@@ -1891,6 +1891,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1946,27 +1967,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2277,7 +2277,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2743,51 +2743,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2971,7 +2926,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/32/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index e54b3a2..0a485ef 100644
--- a/30/32/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -3144,7 +3144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3744,7 +3744,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6263,7 +6263,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6377,7 +6377,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6389,7 +6389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6461,7 +6461,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6515,7 +6515,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6533,7 +6533,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6542,7 +6542,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6554,7 +6554,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6566,7 +6566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6581,7 +6581,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6602,7 +6602,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6617,7 +6617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6635,7 +6635,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6650,7 +6650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6668,7 +6668,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6683,7 +6683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6701,7 +6701,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6716,7 +6716,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6734,7 +6734,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6749,7 +6749,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6767,7 +6767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPx"
@@ -6782,7 +6782,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6800,7 +6800,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6815,7 +6815,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6836,7 +6836,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6851,7 +6851,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6869,7 +6869,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6890,10 +6890,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6905,7 +6905,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6920,7 +6920,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6938,7 +6938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPy"
@@ -6953,7 +6953,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6971,7 +6971,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6986,7 +6986,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7001,7 +7001,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7022,7 +7022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7037,7 +7037,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7055,7 +7055,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7070,7 +7070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7088,7 +7088,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7103,7 +7103,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7121,7 +7121,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7136,7 +7136,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7154,7 +7154,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7169,7 +7169,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7187,7 +7187,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIx"
@@ -7202,7 +7202,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKx"
@@ -7220,7 +7220,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7235,7 +7235,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7256,7 +7256,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7271,7 +7271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7289,7 +7289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7310,10 +7310,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7325,7 +7325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7340,7 +7340,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7358,7 +7358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -7373,7 +7373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKy"
@@ -7391,7 +7391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7409,7 +7409,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7421,7 +7421,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7430,7 +7430,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7457,7 +7457,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7472,7 +7472,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7484,7 +7484,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7499,7 +7499,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7511,7 +7511,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7520,7 +7520,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7532,7 +7532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7544,7 +7544,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7556,7 +7556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7568,7 +7568,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7580,7 +7580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7589,7 +7589,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9975,15 +9975,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10029,24 +10020,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10056,24 +10029,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10083,15 +10038,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10218,15 +10164,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10236,15 +10173,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10272,24 +10200,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/32/arm_armv7-a-neon/source-based/libc.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libc.so.lsdump
index 1ffb0ed..b38b96a 100644
--- a/30/32/arm_armv7-a-neon/source-based/libc.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libc.so.lsdump
@@ -262,15 +262,6 @@
    "source_file" : "/bionic/libc/include/signal.h"
   },
   {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIA84_c",
-   "name" : "char [84]",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIA84_c",
-   "size" : 84,
-   "source_file" : "/bionic/libc/include/bits/struct_file.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA8_6fp_reg",
    "name" : "fp_reg [8]",
@@ -325,13 +316,6 @@
    "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_info.h"
   },
   {
-   "linker_set_key" : "_ZTIA_7__sFILE",
-   "name" : "__sFILE []",
-   "referenced_type" : "_ZTI7__sFILE",
-   "self_type" : "_ZTIA_7__sFILE",
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
    "linker_set_key" : "_ZTIA_Pc",
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
@@ -6938,11 +6922,11 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIFvvE",
-   "name" : "void ()",
+   "name" : "void (void)",
    "referenced_type" : "_ZTIFvvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvvE",
-   "source_file" : "/bionic/libc/include/bits/signal_types.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   }
  ],
  "functions" :
@@ -7076,7 +7060,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7100,7 +7084,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7124,7 +7108,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -8546,7 +8530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -8561,7 +8545,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8579,7 +8563,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPj",
@@ -8615,7 +8599,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8630,7 +8614,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8645,7 +8629,7 @@
      "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8696,7 +8680,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -8765,7 +8749,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9689,7 +9673,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -10010,7 +9994,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -10025,7 +10009,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11876,7 +11860,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -12251,7 +12235,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_arm_armv7-a-neon_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -12527,7 +12511,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12542,7 +12526,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13458,12 +13442,6 @@
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
-   "linker_set_key" : "__sF",
-   "name" : "__sF",
-   "referenced_type" : "_ZTIA_7__sFILE",
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
    "linker_set_key" : "_ctype_",
    "name" : "_ctype_",
    "referenced_type" : "_ZTIPKc",
@@ -13974,7 +13952,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14195,11 +14173,11 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvvE",
-   "name" : "void (*)()",
+   "name" : "void (*)(void)",
    "referenced_type" : "_ZTIFvvE",
    "self_type" : "_ZTIPFvvE",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/signal_types.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14212,375 +14190,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/arch-arm/bionic/exidx_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/arch-arm/bionic/exidx_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm_armv7-a-neon_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm_armv7-a-neon_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK10sigset64_t",
    "name" : "const sigset64_t *",
    "referenced_type" : "_ZTIK10sigset64_t",
@@ -14671,24 +14280,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -14698,24 +14289,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -14739,7 +14312,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14752,15 +14325,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm_armv7-a-neon_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm_armv7-a-neon_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14847,7 +14411,7 @@
    "referenced_type" : "_ZTIKPc",
    "self_type" : "_ZTIPKPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/getopt.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14865,7 +14429,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -14892,7 +14456,7 @@
    "referenced_type" : "_ZTIKj",
    "self_type" : "_ZTIPKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -14901,7 +14465,7 @@
    "referenced_type" : "_ZTIKl",
    "self_type" : "_ZTIPKl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -15027,7 +14591,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -15054,7 +14618,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/time.h"
   },
   {
    "alignment" : 4,
@@ -15072,7 +14636,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -15081,7 +14645,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -15127,106 +14691,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm_armv7-a-neon_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm_armv7-a-neon_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
@@ -15400,7 +14864,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -15568,7 +15032,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -15598,7 +15062,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -15608,7 +15072,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIKl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -16056,7 +15520,7 @@
    [
     {
      "field_name" : "fpregs",
-     "referenced_type" : "_ZTIA8_N11user_fpregs6fp_regE"
+     "referenced_type" : "_ZTIA8_6fp_reg"
     },
     {
      "field_name" : "fpsr",
@@ -18309,22 +17773,6 @@
    "fields" :
    [
     {
-     "field_name" : "__private",
-     "referenced_type" : "_ZTIA84_c"
-    }
-   ],
-   "linker_set_key" : "_ZTI7__sFILE",
-   "name" : "__sFILE",
-   "referenced_type" : "_ZTI7__sFILE",
-   "self_type" : "_ZTI7__sFILE",
-   "size" : 84,
-   "source_file" : "/bionic/libc/include/bits/struct_file.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "cmsg_len",
      "referenced_type" : "_ZTIj"
     },
diff --git a/30/32/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump
index 212f374..0e05642 100644
--- a/30/32/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump
@@ -2594,6 +2594,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3128,27 +3149,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4888,7 +4888,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4900,7 +4900,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4909,7 +4909,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4924,7 +4924,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4936,10 +4936,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4951,7 +4951,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4960,7 +4960,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4975,7 +4975,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4984,7 +4984,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4999,7 +4999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5008,7 +5008,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5023,7 +5023,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5035,10 +5035,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5050,7 +5050,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5101,7 +5101,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5122,13 +5122,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5317,10 +5317,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5329,7 +5329,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5347,7 +5347,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5356,7 +5356,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5374,7 +5374,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5392,7 +5392,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -5410,7 +5410,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5437,7 +5437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5452,10 +5452,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5464,7 +5464,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5476,7 +5476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5494,7 +5494,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5512,7 +5512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5533,7 +5533,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5548,7 +5548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5563,7 +5563,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5584,7 +5584,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5605,7 +5605,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5626,7 +5626,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5647,7 +5647,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5671,7 +5671,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5695,7 +5695,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5719,7 +5719,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5743,7 +5743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5767,7 +5767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5791,7 +5791,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5812,7 +5812,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5833,7 +5833,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5902,7 +5902,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5929,7 +5929,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5950,7 +5950,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5962,7 +5962,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5980,7 +5980,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6389,15 +6389,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6425,60 +6416,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6488,69 +6425,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6560,69 +6434,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6632,15 +6443,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6659,15 +6461,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6686,15 +6479,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6812,24 +6596,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6848,27 +6614,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6884,15 +6632,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6904,7 +6643,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6920,15 +6659,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6938,15 +6668,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6956,60 +6677,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/32/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump
index ec26307..c0123c0 100644
--- a/30/32/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump
@@ -9396,7 +9396,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -10043,15 +10043,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 4,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -11048,7 +11039,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 4,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19835,11 +19826,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -26342,7 +26328,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump b/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
index 3e3856d..81e148c 100644
--- a/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
@@ -1825,7 +1825,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1879,7 +1879,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1924,7 +1924,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1947,12 +1947,14 @@
    "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK11EventTagMap",
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "size" : 116,
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2032,7 +2034,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
diff --git a/30/32/arm_armv7-a-neon/source-based/libm.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libm.so.lsdump
index 1f09b33..3db175b 100644
--- a/30/32/arm_armv7-a-neon/source-based/libm.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libm.so.lsdump
@@ -143,7 +143,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA2_d",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
   },
   {
    "alignment" : 8,
@@ -161,7 +161,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA2_f",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
   },
   {
    "alignment" : 4,
@@ -233,7 +233,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA5_d",
    "size" : 40,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/external/arm-optimized-routines/math/math_config.h"
   },
   {
    "alignment" : 4,
@@ -242,7 +242,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA5_f",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 8,
@@ -269,7 +269,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA6_d",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/external/arm-optimized-routines/math/math_config.h"
   },
   {
    "alignment" : 4,
@@ -4416,7 +4416,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIPd",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4452,7 +4452,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/fenv.h"
   },
   {
    "alignment" : 4,
@@ -4584,7 +4584,7 @@
    "referenced_type" : "_ZTIA5_f",
    "self_type" : "_ZTIA5_Kf",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4604,7 +4604,7 @@
    "referenced_type" : "_ZTIA6_d",
    "self_type" : "_ZTIA6_Kd",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4732,7 +4732,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atan.c"
   },
   {
    "alignment" : 8,
@@ -4752,7 +4752,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4762,7 +4762,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cbrt.c"
   },
   {
    "alignment" : 8,
@@ -4773,7 +4773,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_tanh.c"
   },
   {
    "alignment" : 4,
@@ -4784,7 +4784,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_tanhf.c"
   },
   {
    "alignment" : 8,
@@ -4794,7 +4794,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acos.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_log10.c"
   },
   {
    "alignment" : 4,
@@ -4804,7 +4804,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_expm1f.c"
   }
  ],
  "record_types" :
@@ -5701,7 +5701,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -5723,7 +5723,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
index f790703..5169eb4 100644
--- a/30/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
@@ -347,11 +347,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 1536,
+   "size" : 5632,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7028,6 +7037,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7131,27 +7161,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7754,7 +7763,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7809,7 +7818,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19015,7 +19024,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19030,7 +19039,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19048,7 +19057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19063,7 +19072,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19081,7 +19090,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19153,7 +19162,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19219,7 +19228,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19234,7 +19243,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20050,7 +20059,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20083,7 +20092,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20776,7 +20785,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20800,7 +20809,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20824,7 +20833,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20890,7 +20899,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20974,7 +20983,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21022,7 +21031,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21034,10 +21043,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21049,7 +21058,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21061,7 +21070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21082,7 +21091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21100,7 +21109,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21118,7 +21127,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21136,7 +21145,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21154,7 +21163,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21181,7 +21190,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21199,7 +21208,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21214,7 +21223,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21223,7 +21232,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21244,7 +21253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21262,7 +21271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21280,7 +21289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21298,7 +21307,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21316,7 +21325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21343,7 +21352,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21361,7 +21370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21379,7 +21388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21394,7 +21403,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIi",
@@ -22386,96 +22395,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22521,42 +22440,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22886,7 +22769,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -23103,41 +22986,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23220,51 +23068,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23274,15 +23077,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23472,6 +23266,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23915,7 +23718,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27282,24 +27085,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27525,42 +27310,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28394,7 +28143,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -28497,15 +28246,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28542,24 +28282,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31199,7 +30921,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31253,7 +30975,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31287,42 +31009,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32112,7 +31798,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 168,
+   "size" : 232,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32280,7 +31966,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32370,7 +32056,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33021,7 +32707,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33130,7 +32816,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33156,16 +32842,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34136,7 +33812,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34146,46 +33822,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 4,
@@ -34246,96 +33882,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -35076,11 +34622,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39769,38 +39310,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -39973,22 +39482,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
+     "field_offset" : 1760,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
+     "field_offset" : 1768,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1264,
+     "field_offset" : 1776,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1280,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -39997,7 +39506,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 168,
+   "size" : 232,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45284,27 +44793,15 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1088,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1120,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
-     "field_offset" : 1152,
+     "field_offset" : 1120,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1248,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45312,7 +44809,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48149,6 +47646,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
@@ -49948,12 +49484,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 576,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -49961,7 +49497,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -52977,10 +52513,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -52990,10 +52523,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53003,7 +52533,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -53961,7 +53491,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -53969,7 +53499,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54458,60 +53988,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55310,7 +54786,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 24,
+   "size" : 88,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55548,325 +55024,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 13248,
+     "field_offset" : 46016,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 13280,
+     "field_offset" : 46048,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 13312,
+     "field_offset" : 46080,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 13376,
+     "field_offset" : 46144,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 13440,
+     "field_offset" : 46208,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 13504,
+     "field_offset" : 46272,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 13536,
+     "field_offset" : 46304,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 14048,
+     "field_offset" : 46816,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 14176,
+     "field_offset" : 46944,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 14208,
+     "field_offset" : 46976,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 14240,
+     "field_offset" : 47008,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 14272,
+     "field_offset" : 47040,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 14304,
+     "field_offset" : 47072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 14336,
+     "field_offset" : 47104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 14368,
+     "field_offset" : 47136,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 14400,
+     "field_offset" : 47168,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 14432,
+     "field_offset" : 47200,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 14440,
+     "field_offset" : 47208,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 14448,
+     "field_offset" : 47216,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 14464,
+     "field_offset" : 47232,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 14496,
+     "field_offset" : 47264,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 14624,
+     "field_offset" : 47392,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 14656,
+     "field_offset" : 47424,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 14688,
+     "field_offset" : 47456,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 14720,
+     "field_offset" : 47488,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 14752,
+     "field_offset" : 47520,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iSt9__va_listEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 14784,
+     "field_offset" : 47552,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 14816,
+     "field_offset" : 47584,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 14848,
+     "field_offset" : 47616,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 14880,
+     "field_offset" : 47648,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 14912,
+     "field_offset" : 47680,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 14944,
+     "field_offset" : 47712,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 14976,
+     "field_offset" : 47744,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 15168,
+     "field_offset" : 48448,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 15232,
+     "field_offset" : 48512,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 15264,
+     "field_offset" : 48544,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 15272,
+     "field_offset" : 48552,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 15280,
+     "field_offset" : 48560,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 15296,
+     "field_offset" : 48576,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 15328,
+     "field_offset" : 48608,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 15360,
+     "field_offset" : 48640,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 15424,
+     "field_offset" : 48704,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 15488,
+     "field_offset" : 48768,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 15552,
+     "field_offset" : 48832,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 15616,
+     "field_offset" : 48896,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 15680,
+     "field_offset" : 48960,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 15744,
+     "field_offset" : 49024,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 15752,
+     "field_offset" : 49032,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 15760,
+     "field_offset" : 49040,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 15776,
+     "field_offset" : 49056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 15808,
+     "field_offset" : 49088,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 15840,
+     "field_offset" : 49120,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 15936,
+     "field_offset" : 49216,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 15968,
+     "field_offset" : 49248,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55875,7 +55351,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 2000,
+   "size" : 6160,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56787,7 +56263,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56827,7 +56303,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56867,7 +56343,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56907,7 +56383,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
@@ -56947,7 +56423,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -56987,7 +56463,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57027,7 +56503,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57067,7 +56543,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57107,7 +56583,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57150,7 +56626,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57190,7 +56666,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58876,6 +58352,32 @@
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "size" : 84,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -59010,7 +58512,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump
index afb98d6..683d471 100644
--- a/30/32/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump
@@ -1194,6 +1194,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1249,27 +1270,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1760,7 +1760,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2658,15 +2658,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2850,7 +2841,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/32/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump
index 8512c17..eab814e 100644
--- a/30/32/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump
@@ -2434,24 +2434,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2461,24 +2443,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2488,24 +2452,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2515,24 +2461,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2542,24 +2470,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2569,24 +2479,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2596,24 +2488,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2623,24 +2497,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2668,33 +2524,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2704,33 +2533,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2785,24 +2587,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2812,24 +2596,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2839,24 +2605,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2866,24 +2614,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2893,24 +2623,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2920,24 +2632,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2947,24 +2641,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2974,24 +2650,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3155,36 +2813,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 4,
@@ -3195,36 +2823,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 4,
diff --git a/30/32/arm_armv7-a-neon/source-based/libvulkan.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libvulkan.so.lsdump
index eca0a9a..3754dfb 100644
--- a/30/32/arm_armv7-a-neon/source-based/libvulkan.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 128,
@@ -873,27 +801,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11603,7 +11519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11696,7 +11612,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11717,7 +11633,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11735,7 +11651,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11768,7 +11684,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11789,7 +11705,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11807,7 +11723,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11831,7 +11747,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11864,7 +11780,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11888,7 +11804,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11915,7 +11831,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11942,7 +11858,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11966,7 +11882,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11993,7 +11909,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12023,7 +11939,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12050,7 +11966,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12083,7 +11999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12104,7 +12020,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12134,7 +12050,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12152,7 +12068,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12176,7 +12092,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12203,7 +12119,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12227,7 +12143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12251,7 +12167,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12269,7 +12185,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12281,13 +12197,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12299,7 +12215,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12323,7 +12239,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12338,7 +12254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12377,7 +12293,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12404,7 +12320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12422,7 +12338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12443,7 +12359,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12473,7 +12389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12488,7 +12404,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12509,7 +12425,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12527,7 +12443,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12542,7 +12458,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12560,7 +12476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12575,7 +12491,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12596,7 +12512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12614,7 +12530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12632,7 +12548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12650,7 +12566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12671,7 +12587,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12695,7 +12611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12737,7 +12653,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12932,7 +12848,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13730,7 +13646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13742,7 +13658,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13763,7 +13679,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13889,7 +13805,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -14303,7 +14219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14321,7 +14237,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14339,7 +14255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14357,7 +14273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14372,7 +14288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14387,7 +14303,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14405,7 +14321,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14423,7 +14339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14453,7 +14369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14471,7 +14387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14486,7 +14402,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14501,7 +14417,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14522,7 +14438,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14537,7 +14453,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14552,7 +14468,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14570,7 +14486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14588,7 +14504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14621,7 +14537,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14642,7 +14558,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14660,7 +14576,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14681,7 +14597,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14702,7 +14618,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14951,7 +14867,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15720,15 +15636,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -16854,78 +16761,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -16935,78 +16770,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17079,15 +16842,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP12VkInstance_T",
    "name" : "VkInstance_T **",
    "referenced_type" : "_ZTIP12VkInstance_T",
@@ -17097,18 +16851,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -17117,7 +16862,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17126,7 +16871,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17142,15 +16887,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -18551,86 +18287,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 4,
@@ -18641,86 +18297,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 4,
diff --git a/30/32/arm_armv7-a-neon/source-based/libz.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libz.so.lsdump
index 03ff860..481057e 100644
--- a/30/32/arm_armv7-a-neon/source-based/libz.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libz.so.lsdump
@@ -2240,42 +2240,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/crc32.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/deflate.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/trees.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
diff --git a/30/32/x86/source-based/libEGL.so.lsdump b/30/32/x86/source-based/libEGL.so.lsdump
index c784ee9..65f60d5 100644
--- a/30/32/x86/source-based/libEGL.so.lsdump
+++ b/30/32/x86/source-based/libEGL.so.lsdump
@@ -2020,15 +2020,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/32/x86/source-based/libOpenMAXAL.so.lsdump b/30/32/x86/source-based/libOpenMAXAL.so.lsdump
index c31eb6b..04f7118 100644
--- a/30/32/x86/source-based/libOpenMAXAL.so.lsdump
+++ b/30/32/x86/source-based/libOpenMAXAL.so.lsdump
@@ -5891,10 +5891,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26105,24 +26105,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26321,15 +26303,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26339,15 +26312,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26357,15 +26321,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26438,15 +26393,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26456,15 +26402,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26474,15 +26411,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26492,15 +26420,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26510,15 +26429,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26528,15 +26438,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36512,6 +36413,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38055,14 +37965,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38079,14 +37981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38103,14 +37997,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38119,14 +38005,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38143,14 +38021,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38159,14 +38029,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38175,14 +38037,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38199,14 +38053,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38215,14 +38061,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38239,14 +38077,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39546,7 +39376,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39600,13 +39430,13 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android11AudioRecordE",
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41390,16 +41220,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43233,11 +43053,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52882,8 +52697,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52892,7 +52713,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54431,7 +54252,7 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -54700,74 +54521,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4000,
+     "field_offset" : 4896,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4384,
+     "field_offset" : 5280,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5376,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54776,7 +54621,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55158,6 +55003,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57741,6 +57640,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57780,6 +57683,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67682,6 +67589,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67721,6 +67632,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68772,6 +68687,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68811,6 +68730,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76688,7 +76611,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/x86/source-based/libOpenSLES.so.lsdump b/30/32/x86/source-based/libOpenSLES.so.lsdump
index a43ac3b..2bf3b04 100644
--- a/30/32/x86/source-based/libOpenSLES.so.lsdump
+++ b/30/32/x86/source-based/libOpenSLES.so.lsdump
@@ -5927,10 +5927,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26213,24 +26213,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26429,15 +26411,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26447,15 +26420,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26465,15 +26429,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26546,15 +26501,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26564,15 +26510,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26582,15 +26519,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26600,15 +26528,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26618,15 +26537,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26636,15 +26546,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36620,6 +36521,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38163,14 +38073,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38187,14 +38089,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38211,14 +38105,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38227,14 +38113,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38251,14 +38129,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38267,14 +38137,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38283,14 +38145,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38307,14 +38161,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38323,14 +38169,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38347,14 +38185,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39654,7 +39484,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39708,13 +39538,13 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android11AudioRecordE",
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41498,16 +41328,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43341,11 +43161,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52990,8 +52805,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53000,7 +52821,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54539,7 +54360,7 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -54808,74 +54629,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4000,
+     "field_offset" : 4896,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4384,
+     "field_offset" : 5280,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5376,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54884,7 +54729,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55266,6 +55111,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57849,6 +57748,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57888,6 +57791,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67790,6 +67697,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67829,6 +67740,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68880,6 +68795,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68919,6 +68838,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76796,7 +76719,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/x86/source-based/libaaudio.so.lsdump b/30/32/x86/source-based/libaaudio.so.lsdump
index 812a083..e724293 100644
--- a/30/32/x86/source-based/libaaudio.so.lsdump
+++ b/30/32/x86/source-based/libaaudio.so.lsdump
@@ -442,7 +442,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -536,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -615,7 +615,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/32/x86/source-based/libandroid.so.lsdump b/30/32/x86/source-based/libandroid.so.lsdump
index 93b6fe1..9df9e28 100644
--- a/30/32/x86/source-based/libandroid.so.lsdump
+++ b/30/32/x86/source-based/libandroid.so.lsdump
@@ -1900,6 +1900,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1955,27 +1976,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2286,7 +2286,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2752,51 +2752,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2989,7 +2944,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/32/x86/source-based/libbinder_ndk.so.lsdump b/30/32/x86/source-based/libbinder_ndk.so.lsdump
index 67471fe..998e22e 100644
--- a/30/32/x86/source-based/libbinder_ndk.so.lsdump
+++ b/30/32/x86/source-based/libbinder_ndk.so.lsdump
@@ -3143,7 +3143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3743,7 +3743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6262,7 +6262,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6376,7 +6376,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6388,7 +6388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6460,7 +6460,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6514,7 +6514,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6532,7 +6532,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6541,7 +6541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6553,7 +6553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6565,7 +6565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6580,7 +6580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6601,7 +6601,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6616,7 +6616,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6634,7 +6634,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6649,7 +6649,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6667,7 +6667,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6682,7 +6682,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6700,7 +6700,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6715,7 +6715,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6733,7 +6733,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6748,7 +6748,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6766,7 +6766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPx"
@@ -6781,7 +6781,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6799,7 +6799,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6814,7 +6814,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6835,7 +6835,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6850,7 +6850,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6868,7 +6868,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6889,10 +6889,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6904,7 +6904,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6919,7 +6919,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6937,7 +6937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPy"
@@ -6952,7 +6952,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6970,7 +6970,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6985,7 +6985,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7000,7 +7000,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7021,7 +7021,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7036,7 +7036,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7054,7 +7054,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7069,7 +7069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7087,7 +7087,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7102,7 +7102,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7120,7 +7120,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7135,7 +7135,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7153,7 +7153,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7168,7 +7168,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7186,7 +7186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIx"
@@ -7201,7 +7201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKx"
@@ -7219,7 +7219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7234,7 +7234,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7255,7 +7255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7270,7 +7270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7288,7 +7288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7309,10 +7309,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7324,7 +7324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7339,7 +7339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7357,7 +7357,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -7372,7 +7372,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKy"
@@ -7390,7 +7390,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7408,7 +7408,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7420,7 +7420,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7429,7 +7429,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7456,7 +7456,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7471,7 +7471,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7483,7 +7483,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7498,7 +7498,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7510,7 +7510,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7519,7 +7519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7531,7 +7531,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7543,7 +7543,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7555,7 +7555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7567,7 +7567,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7579,7 +7579,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7588,7 +7588,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9974,15 +9974,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10028,24 +10019,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10055,24 +10028,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10082,15 +10037,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10217,15 +10163,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10235,15 +10172,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10271,24 +10199,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/32/x86/source-based/libc.so.lsdump b/30/32/x86/source-based/libc.so.lsdump
index 97f3b59..54635f4 100644
--- a/30/32/x86/source-based/libc.so.lsdump
+++ b/30/32/x86/source-based/libc.so.lsdump
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/bits/fenv_x86.h"
+   "source_file" : "/bionic/libc/include/utmp.h"
   },
   {
    "alignment" : 4,
@@ -6390,7 +6390,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPKvS0_E",
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -6665,7 +6665,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -6689,7 +6689,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -6713,7 +6713,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7280,7 +7280,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPK10sigset64_t"
@@ -7304,7 +7304,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -8123,7 +8123,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -8138,7 +8138,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8156,7 +8156,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPi",
@@ -8192,7 +8192,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8207,7 +8207,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8222,7 +8222,7 @@
      "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8273,7 +8273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -8342,7 +8342,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9266,7 +9266,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9551,7 +9551,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -9566,7 +9566,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11417,7 +11417,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -11654,7 +11654,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_x86_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -11915,7 +11915,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11930,7 +11930,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13251,7 +13251,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -13395,7 +13395,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "self_type" : "_ZTIPFiPKvS0_E",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -13480,366 +13480,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/arch-x86/bionic/__libc_init_sysinfo.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/arch-x86/bionic/__libc_init_sysinfo.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK10sigset64_t",
    "name" : "const sigset64_t *",
    "referenced_type" : "_ZTIK10sigset64_t",
@@ -13930,24 +13570,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -13957,24 +13579,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -13998,7 +13602,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14007,28 +13611,10 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIPK8timespec",
    "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump",
-   "size" : 4,
    "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14133,7 +13719,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
@@ -14322,7 +13908,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/bits/getopt.h"
   },
   {
    "alignment" : 4,
@@ -14358,7 +13944,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIPl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -14376,7 +13962,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
  "qualified_types" :
@@ -14395,96 +13981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
@@ -14668,7 +14164,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14678,7 +14174,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
   },
   {
    "alignment" : 4,
@@ -14836,7 +14332,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 1,
@@ -14856,7 +14352,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/wchar.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
   },
   {
    "alignment" : 4,
diff --git a/30/32/x86/source-based/libcamera2ndk.so.lsdump b/30/32/x86/source-based/libcamera2ndk.so.lsdump
index 4438805..07b8810 100644
--- a/30/32/x86/source-based/libcamera2ndk.so.lsdump
+++ b/30/32/x86/source-based/libcamera2ndk.so.lsdump
@@ -2593,6 +2593,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3127,27 +3148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4887,7 +4887,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4899,7 +4899,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4908,7 +4908,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4923,7 +4923,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4935,10 +4935,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4950,7 +4950,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4959,7 +4959,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4974,7 +4974,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4983,7 +4983,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4998,7 +4998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5007,7 +5007,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5022,7 +5022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5034,10 +5034,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5049,7 +5049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5100,7 +5100,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5121,13 +5121,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5316,10 +5316,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5328,7 +5328,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5346,7 +5346,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5355,7 +5355,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5373,7 +5373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5391,7 +5391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -5409,7 +5409,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5436,7 +5436,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5451,10 +5451,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5463,7 +5463,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5475,7 +5475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5493,7 +5493,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5511,7 +5511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5532,7 +5532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5547,7 +5547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5562,7 +5562,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5583,7 +5583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5604,7 +5604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5625,7 +5625,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5646,7 +5646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5670,7 +5670,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5694,7 +5694,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5718,7 +5718,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5742,7 +5742,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5766,7 +5766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5790,7 +5790,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5811,7 +5811,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5832,7 +5832,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5901,7 +5901,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5928,7 +5928,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5949,7 +5949,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5961,7 +5961,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5979,7 +5979,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6388,15 +6388,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6424,60 +6415,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6487,69 +6424,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6559,69 +6433,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6631,15 +6442,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6658,15 +6460,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6685,15 +6478,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6811,24 +6595,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6847,27 +6613,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6883,15 +6631,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6903,7 +6642,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6919,15 +6658,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6937,15 +6667,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6955,60 +6676,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/32/x86/source-based/libjnigraphics.so.lsdump b/30/32/x86/source-based/libjnigraphics.so.lsdump
index feaf87b..cd21c79 100644
--- a/30/32/x86/source-based/libjnigraphics.so.lsdump
+++ b/30/32/x86/source-based/libjnigraphics.so.lsdump
@@ -8870,7 +8870,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -9517,15 +9517,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 4,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -10522,7 +10513,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 4,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19059,11 +19050,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -25578,7 +25564,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/x86/source-based/libm.so.lsdump b/30/32/x86/source-based/libm.so.lsdump
index add3925..6ad0130 100644
--- a/30/32/x86/source-based/libm.so.lsdump
+++ b/30/32/x86/source-based/libm.so.lsdump
@@ -152,7 +152,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA2_d",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquo.c"
   },
   {
    "alignment" : 4,
@@ -170,7 +170,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA2_f",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquof.c"
   },
   {
    "alignment" : 4,
@@ -251,7 +251,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA5_f",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -278,7 +278,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA6_d",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4125,7 +4125,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIPd",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4134,7 +4134,7 @@
    "referenced_type" : "_ZTIe",
    "self_type" : "_ZTIPe",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-netbsd/lib/libm/complex/cephes_subrl.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4232,7 +4232,7 @@
    "referenced_type" : "_ZTIA2_d",
    "self_type" : "_ZTIA2_Kd",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquo.c"
   },
   {
    "alignment" : 4,
@@ -4242,7 +4242,7 @@
    "referenced_type" : "_ZTIA2_f",
    "self_type" : "_ZTIA2_Kf",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquof.c"
   },
   {
    "alignment" : 4,
@@ -4282,7 +4282,7 @@
    "referenced_type" : "_ZTIA5_f",
    "self_type" : "_ZTIA5_Kf",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4302,7 +4302,7 @@
    "referenced_type" : "_ZTIA6_d",
    "self_type" : "_ZTIA6_Kd",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4440,7 +4440,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_lround.c"
   },
   {
    "alignment" : 4,
@@ -4460,7 +4460,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_lround.c"
   },
   {
    "alignment" : 4,
@@ -4470,7 +4470,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cbrtf.c"
   },
   {
    "alignment" : 2,
@@ -4512,7 +4512,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_log1pf.c"
   }
  ],
  "record_types" :
@@ -5450,7 +5450,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -5472,7 +5472,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/32/x86/source-based/libmediandk.so.lsdump b/30/32/x86/source-based/libmediandk.so.lsdump
index f3dc0fe..9b9f369 100644
--- a/30/32/x86/source-based/libmediandk.so.lsdump
+++ b/30/32/x86/source-based/libmediandk.so.lsdump
@@ -347,11 +347,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 1536,
+   "size" : 5632,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7027,6 +7036,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7130,27 +7160,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7753,7 +7762,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7808,7 +7817,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19014,7 +19023,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19029,7 +19038,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19047,7 +19056,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19062,7 +19071,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19080,7 +19089,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19152,7 +19161,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19218,7 +19227,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19233,7 +19242,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20049,7 +20058,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20082,7 +20091,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20775,7 +20784,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20799,7 +20808,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20823,7 +20832,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20889,7 +20898,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20973,7 +20982,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21021,7 +21030,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21033,10 +21042,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21048,7 +21057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21060,7 +21069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21081,7 +21090,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21099,7 +21108,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21117,7 +21126,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21135,7 +21144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21153,7 +21162,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21180,7 +21189,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21198,7 +21207,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21213,7 +21222,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21222,7 +21231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21243,7 +21252,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21261,7 +21270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21279,7 +21288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21297,7 +21306,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21315,7 +21324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21342,7 +21351,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21360,7 +21369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21378,7 +21387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21393,7 +21402,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIi",
@@ -22385,96 +22394,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22520,42 +22439,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22885,7 +22768,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -23102,41 +22985,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23219,51 +23067,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23273,15 +23076,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23471,6 +23265,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23914,7 +23717,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27281,24 +27084,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27524,42 +27309,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28393,7 +28142,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -28496,15 +28245,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28541,24 +28281,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31198,7 +30920,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31252,7 +30974,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31286,42 +31008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32111,7 +31797,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 164,
+   "size" : 228,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32279,7 +31965,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32369,7 +32055,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33020,7 +32706,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33129,7 +32815,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33155,16 +32841,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34135,7 +33811,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34145,46 +33821,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 4,
@@ -34245,96 +33881,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -35075,11 +34621,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39768,38 +39309,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -39972,22 +39481,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
+     "field_offset" : 1760,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
+     "field_offset" : 1768,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1264,
+     "field_offset" : 1776,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1280,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -39996,7 +39505,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 164,
+   "size" : 228,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45283,27 +44792,15 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1056,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1088,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
-     "field_offset" : 1120,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1216,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45311,7 +44808,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48148,6 +47645,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
@@ -49947,12 +49483,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 576,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -49960,7 +49496,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -52976,10 +52512,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -52989,10 +52522,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53002,7 +52532,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -53960,7 +53490,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -53968,7 +53498,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54457,60 +53987,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55309,7 +54785,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 24,
+   "size" : 88,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55547,325 +55023,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 13248,
+     "field_offset" : 46016,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 13280,
+     "field_offset" : 46048,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 13312,
+     "field_offset" : 46080,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 13344,
+     "field_offset" : 46112,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 13408,
+     "field_offset" : 46176,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 13472,
+     "field_offset" : 46240,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 13504,
+     "field_offset" : 46272,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 14016,
+     "field_offset" : 46784,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 14144,
+     "field_offset" : 46912,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 14176,
+     "field_offset" : 46944,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 14208,
+     "field_offset" : 46976,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 14240,
+     "field_offset" : 47008,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 14272,
+     "field_offset" : 47040,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 14304,
+     "field_offset" : 47072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 14336,
+     "field_offset" : 47104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 14368,
+     "field_offset" : 47136,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 14400,
+     "field_offset" : 47168,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 14408,
+     "field_offset" : 47176,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 14416,
+     "field_offset" : 47184,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 14432,
+     "field_offset" : 47200,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 14464,
+     "field_offset" : 47232,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 14592,
+     "field_offset" : 47360,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 14624,
+     "field_offset" : 47392,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 14656,
+     "field_offset" : 47424,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 14688,
+     "field_offset" : 47456,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 14720,
+     "field_offset" : 47488,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iPcEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 14752,
+     "field_offset" : 47520,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 14784,
+     "field_offset" : 47552,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 14816,
+     "field_offset" : 47584,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 14848,
+     "field_offset" : 47616,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 14880,
+     "field_offset" : 47648,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 14912,
+     "field_offset" : 47680,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 14944,
+     "field_offset" : 47712,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 15104,
+     "field_offset" : 48384,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 15168,
+     "field_offset" : 48448,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 15200,
+     "field_offset" : 48480,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 15208,
+     "field_offset" : 48488,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 15216,
+     "field_offset" : 48496,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 15232,
+     "field_offset" : 48512,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 15264,
+     "field_offset" : 48544,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 15296,
+     "field_offset" : 48576,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 15360,
+     "field_offset" : 48640,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 15424,
+     "field_offset" : 48704,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 15488,
+     "field_offset" : 48768,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 15520,
+     "field_offset" : 48800,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 15584,
+     "field_offset" : 48864,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 15648,
+     "field_offset" : 48928,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 15656,
+     "field_offset" : 48936,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 15664,
+     "field_offset" : 48944,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 15680,
+     "field_offset" : 48960,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 15712,
+     "field_offset" : 48992,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 15744,
+     "field_offset" : 49024,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 15840,
+     "field_offset" : 49120,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 15872,
+     "field_offset" : 49152,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55874,7 +55350,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 1988,
+   "size" : 6148,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56786,7 +56262,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56826,7 +56302,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56866,7 +56342,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56906,7 +56382,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
@@ -56946,7 +56422,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -56986,7 +56462,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57026,7 +56502,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57066,7 +56542,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57106,7 +56582,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57149,7 +56625,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57189,7 +56665,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58879,6 +58355,32 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "size" : 84,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "_ZTIN7android11FlattenableINS_9FenceTime8SnapshotEEE"
     }
    ],
@@ -59009,7 +58511,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/x86/source-based/libnativewindow.so.lsdump b/30/32/x86/source-based/libnativewindow.so.lsdump
index 57e3e39..f0508e4 100644
--- a/30/32/x86/source-based/libnativewindow.so.lsdump
+++ b/30/32/x86/source-based/libnativewindow.so.lsdump
@@ -1203,6 +1203,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1258,27 +1279,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1769,7 +1769,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2667,15 +2667,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2868,7 +2859,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/32/x86/source-based/libneuralnetworks.so.lsdump b/30/32/x86/source-based/libneuralnetworks.so.lsdump
index 0708192..d6197ff 100644
--- a/30/32/x86/source-based/libneuralnetworks.so.lsdump
+++ b/30/32/x86/source-based/libneuralnetworks.so.lsdump
@@ -2432,24 +2432,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2459,24 +2441,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2486,24 +2450,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2513,24 +2459,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2540,24 +2468,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2567,24 +2477,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2594,24 +2486,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2621,24 +2495,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2666,33 +2522,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2702,33 +2531,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2783,24 +2585,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2810,24 +2594,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2837,24 +2603,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2864,24 +2612,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2891,24 +2621,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2918,24 +2630,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2945,24 +2639,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2972,24 +2648,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3153,36 +2811,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 4,
@@ -3193,36 +2821,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 4,
diff --git a/30/32/x86/source-based/libvulkan.so.lsdump b/30/32/x86/source-based/libvulkan.so.lsdump
index 8547611..6345e58 100644
--- a/30/32/x86/source-based/libvulkan.so.lsdump
+++ b/30/32/x86/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 128,
@@ -872,27 +800,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11602,7 +11518,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11695,7 +11611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11716,7 +11632,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11734,7 +11650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11767,7 +11683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11788,7 +11704,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11806,7 +11722,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11830,7 +11746,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11863,7 +11779,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11887,7 +11803,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11914,7 +11830,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11941,7 +11857,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11965,7 +11881,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11992,7 +11908,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12022,7 +11938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12049,7 +11965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12082,7 +11998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12103,7 +12019,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12133,7 +12049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12151,7 +12067,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12175,7 +12091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12202,7 +12118,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12226,7 +12142,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12250,7 +12166,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12268,7 +12184,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12280,13 +12196,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12298,7 +12214,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12322,7 +12238,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12337,7 +12253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12376,7 +12292,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12403,7 +12319,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12421,7 +12337,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12442,7 +12358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12472,7 +12388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12487,7 +12403,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12508,7 +12424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12526,7 +12442,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12541,7 +12457,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12559,7 +12475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12574,7 +12490,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12595,7 +12511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12613,7 +12529,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12631,7 +12547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12649,7 +12565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12670,7 +12586,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12694,7 +12610,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12736,7 +12652,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12931,7 +12847,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13729,7 +13645,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13741,7 +13657,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13762,7 +13678,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13888,7 +13804,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -14302,7 +14218,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14320,7 +14236,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14338,7 +14254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14356,7 +14272,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14371,7 +14287,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14386,7 +14302,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14404,7 +14320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14422,7 +14338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14452,7 +14368,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14470,7 +14386,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14485,7 +14401,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14500,7 +14416,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14521,7 +14437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14536,7 +14452,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14551,7 +14467,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14569,7 +14485,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14587,7 +14503,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14620,7 +14536,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14641,7 +14557,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14659,7 +14575,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14680,7 +14596,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14701,7 +14617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14950,7 +14866,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15719,15 +15635,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -16853,78 +16760,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -16934,78 +16769,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17078,15 +16841,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP12VkInstance_T",
    "name" : "VkInstance_T **",
    "referenced_type" : "_ZTIP12VkInstance_T",
@@ -17096,18 +16850,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -17116,7 +16861,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17125,7 +16870,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17141,15 +16886,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -18550,86 +18286,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 4,
@@ -18640,86 +18296,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 4,
diff --git a/30/32/x86/source-based/libz.so.lsdump b/30/32/x86/source-based/libz.so.lsdump
index a062327..ef28159 100644
--- a/30/32/x86/source-based/libz.so.lsdump
+++ b/30/32/x86/source-based/libz.so.lsdump
@@ -2239,42 +2239,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/crc32.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/deflate.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/trees.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
diff --git a/30/64/arm64_armv8-a/source-based/libEGL.so.lsdump b/30/64/arm64_armv8-a/source-based/libEGL.so.lsdump
index 1bb0269..0fbc9eb 100644
--- a/30/64/arm64_armv8-a/source-based/libEGL.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libEGL.so.lsdump
@@ -2022,15 +2022,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/opengl/libs/libEGL/android_arm64_armv8-a_shared/obj/frameworks/native/opengl/libs/EGL/eglApi.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/opengl/libs/libEGL/android_arm64_armv8-a_shared/obj/frameworks/native/opengl/libs/EGL/eglApi.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump b/30/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
index f7b2188..af6845a 100644
--- a/30/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
@@ -5892,10 +5892,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26106,24 +26106,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26322,15 +26304,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26340,15 +26313,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm64_armv8-a_shared_cfi/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26358,15 +26322,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm64_armv8-a_shared_cfi/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26439,15 +26394,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26457,15 +26403,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26475,15 +26412,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26493,15 +26421,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26511,15 +26430,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26529,15 +26439,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm64_armv8-a_shared_cfi/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36513,6 +36414,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38065,14 +37975,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38089,14 +37991,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38113,14 +38007,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38129,14 +38015,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38153,14 +38031,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38169,14 +38039,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38185,14 +38047,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38209,14 +38063,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38225,14 +38071,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38249,14 +38087,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39556,7 +39386,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39616,7 +39446,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41400,16 +41230,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 8,
@@ -43253,11 +43073,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52902,8 +52717,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 8256,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 8448,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52912,7 +52733,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54720,74 +54541,98 @@
     },
     {
      "access" : "private",
-     "field_name" : "mDeathNotifier",
+     "field_name" : "mPreviousTimestamp",
      "field_offset" : 2432,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 3264,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 3272,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDeathNotifier",
+     "field_offset" : 3328,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 2496,
+     "field_offset" : 3392,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 2528,
+     "field_offset" : 3424,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 2560,
+     "field_offset" : 3456,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 2592,
+     "field_offset" : 3488,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 4768,
+     "field_offset" : 5664,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 4800,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 4864,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 4992,
+     "field_offset" : 5888,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 5024,
+     "field_offset" : 5920,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 5056,
+     "field_offset" : 5952,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 5568,
+     "field_offset" : 6464,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 6656,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54796,7 +54641,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55178,6 +55023,60 @@
    ]
   },
   {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 8,
    "base_specifiers" :
@@ -57761,6 +57660,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57800,6 +57703,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67702,6 +67609,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67741,6 +67652,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68792,6 +68707,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68831,6 +68750,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76708,7 +76631,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump b/30/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
index 0221eb8..c4cb350 100644
--- a/30/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
@@ -5928,10 +5928,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26214,24 +26214,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26430,15 +26412,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26448,15 +26421,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm64_armv8-a_shared_cfi/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26466,15 +26430,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm64_armv8-a_shared_cfi/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26547,15 +26502,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26565,15 +26511,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26583,15 +26520,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26601,15 +26529,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26619,15 +26538,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26637,15 +26547,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm64_armv8-a_shared_cfi/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36621,6 +36522,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38173,14 +38083,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38197,14 +38099,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38221,14 +38115,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38237,14 +38123,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38261,14 +38139,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38277,14 +38147,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38293,14 +38155,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38317,14 +38171,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38333,14 +38179,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38357,14 +38195,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39664,7 +39494,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39724,7 +39554,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41508,16 +41338,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm64_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 8,
@@ -43361,11 +43181,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -53010,8 +52825,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 8256,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 8448,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53020,7 +52841,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54828,74 +54649,98 @@
     },
     {
      "access" : "private",
-     "field_name" : "mDeathNotifier",
+     "field_name" : "mPreviousTimestamp",
      "field_offset" : 2432,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 3264,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 3272,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDeathNotifier",
+     "field_offset" : 3328,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 2496,
+     "field_offset" : 3392,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 2528,
+     "field_offset" : 3424,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 2560,
+     "field_offset" : 3456,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 2592,
+     "field_offset" : 3488,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 4768,
+     "field_offset" : 5664,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 4800,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 4864,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 4992,
+     "field_offset" : 5888,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 5024,
+     "field_offset" : 5920,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 5056,
+     "field_offset" : 5952,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 5568,
+     "field_offset" : 6464,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 6656,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54904,7 +54749,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55286,6 +55131,60 @@
    ]
   },
   {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 8,
    "base_specifiers" :
@@ -57869,6 +57768,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57908,6 +57811,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67810,6 +67717,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67849,6 +67760,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68900,6 +68815,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68939,6 +68858,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76816,7 +76739,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm64_armv8-a/source-based/libaaudio.so.lsdump b/30/64/arm64_armv8-a/source-based/libaaudio.so.lsdump
index 20baa0e..26640b0 100644
--- a/30/64/arm64_armv8-a/source-based/libaaudio.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libaaudio.so.lsdump
@@ -443,7 +443,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -537,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -616,7 +616,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/64/arm64_armv8-a/source-based/libandroid.so.lsdump b/30/64/arm64_armv8-a/source-based/libandroid.so.lsdump
index 48a1aad..5761486 100644
--- a/30/64/arm64_armv8-a/source-based/libandroid.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libandroid.so.lsdump
@@ -1891,6 +1891,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1946,27 +1967,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2277,7 +2277,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2743,51 +2743,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm64_armv8-a_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm64_armv8-a_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm64_armv8-a_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm64_armv8-a_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2980,7 +2935,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump b/30/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
index c168591..f7425d5 100644
--- a/30/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -3144,7 +3144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3744,7 +3744,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6263,7 +6263,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6377,7 +6377,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6389,7 +6389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6461,7 +6461,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6515,7 +6515,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6533,7 +6533,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6542,7 +6542,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6554,7 +6554,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6566,7 +6566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6581,7 +6581,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6602,7 +6602,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6617,7 +6617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6635,7 +6635,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6650,7 +6650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6668,7 +6668,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6683,7 +6683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6701,7 +6701,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6716,7 +6716,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6734,7 +6734,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6749,7 +6749,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6767,7 +6767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPl"
@@ -6782,7 +6782,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6800,7 +6800,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6815,7 +6815,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6836,7 +6836,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6851,7 +6851,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6869,7 +6869,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6890,10 +6890,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6905,7 +6905,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6920,7 +6920,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6938,7 +6938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -6953,7 +6953,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6971,7 +6971,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6986,7 +6986,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7001,7 +7001,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7022,7 +7022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7037,7 +7037,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7055,7 +7055,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7070,7 +7070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7088,7 +7088,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7103,7 +7103,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7121,7 +7121,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7136,7 +7136,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7154,7 +7154,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7169,7 +7169,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7187,7 +7187,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIl"
@@ -7202,7 +7202,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKl"
@@ -7220,7 +7220,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7235,7 +7235,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7256,7 +7256,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7271,7 +7271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7289,7 +7289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7310,10 +7310,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7325,7 +7325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7340,7 +7340,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7358,7 +7358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -7373,7 +7373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -7391,7 +7391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7409,7 +7409,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7421,7 +7421,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7430,7 +7430,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7457,7 +7457,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7472,7 +7472,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7484,7 +7484,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7499,7 +7499,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7511,7 +7511,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7520,7 +7520,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7532,7 +7532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7544,7 +7544,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7556,7 +7556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7568,7 +7568,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7580,7 +7580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7589,7 +7589,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9975,15 +9975,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10029,24 +10020,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10056,24 +10029,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10083,15 +10038,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10218,15 +10164,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10236,15 +10173,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10272,24 +10200,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/64/arm64_armv8-a/source-based/libc.so.lsdump b/30/64/arm64_armv8-a/source-based/libc.so.lsdump
index 2a71765..0fa8532 100644
--- a/30/64/arm64_armv8-a/source-based/libc.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libc.so.lsdump
@@ -6191,7 +6191,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -6215,7 +6215,7 @@
      "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -6239,7 +6239,7 @@
      "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -7214,7 +7214,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -7229,7 +7229,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -7247,7 +7247,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPj",
@@ -7283,7 +7283,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7298,7 +7298,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -7313,7 +7313,7 @@
      "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7364,7 +7364,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7433,7 +7433,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIl",
@@ -8357,7 +8357,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9095,7 +9095,7 @@
      "referenced_type" : "_ZTIPm"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -9110,7 +9110,7 @@
      "referenced_type" : "_ZTIPm"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -10961,7 +10961,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -11303,7 +11303,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_arm64_armv8-a_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -11579,7 +11579,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11594,7 +11594,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm64_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13222,348 +13222,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm64_armv8-a_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm64_armv8-a_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm64_armv8-a_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm64_armv8-a_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK11ContextNode",
    "name" : "const ContextNode *",
    "referenced_type" : "_ZTIK11ContextNode",
@@ -13645,24 +13303,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm64_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm64_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -13672,24 +13312,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm64_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm64_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -13717,30 +13339,12 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8sigset_t",
-   "name" : "const sigset_t *",
-   "referenced_type" : "_ZTIK8sigset_t#ODR:",
-   "self_type" : "_ZTIPK8sigset_t#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8sigset_t",
-   "name" : "const sigset_t *",
-   "referenced_type" : "_ZTIK8sigset_t#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump",
-   "self_type" : "_ZTIPK8sigset_t#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm64_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK8sockaddr",
    "name" : "const sockaddr *",
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 8,
@@ -13749,16 +13353,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIPK8timespec",
    "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm64_armv8-a_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm64_armv8-a_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -13848,7 +13443,7 @@
    "referenced_type" : "_ZTIKPc",
    "self_type" : "_ZTIPKPc",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/getopt.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -13866,7 +13461,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -13893,7 +13488,7 @@
    "referenced_type" : "_ZTIKj",
    "self_type" : "_ZTIPKj",
    "size" : 8,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 8,
@@ -14046,7 +13641,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/time.h"
   },
   {
    "alignment" : 8,
@@ -14064,7 +13659,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -14073,7 +13668,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 8,
@@ -14128,96 +13723,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm64_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm64_armv8-a_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm64_armv8-a_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm64_armv8-a_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
@@ -14401,7 +13906,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 8,
@@ -14411,7 +13916,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 16,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -14569,7 +14074,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -14599,7 +14104,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 8,
diff --git a/30/64/arm64_armv8-a/source-based/libcamera2ndk.so.lsdump b/30/64/arm64_armv8-a/source-based/libcamera2ndk.so.lsdump
index a856979..ca03822 100644
--- a/30/64/arm64_armv8-a/source-based/libcamera2ndk.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libcamera2ndk.so.lsdump
@@ -2597,6 +2597,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3131,27 +3152,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4891,7 +4891,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4903,7 +4903,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4912,7 +4912,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4927,7 +4927,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4939,10 +4939,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4954,7 +4954,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4963,7 +4963,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4978,7 +4978,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4987,7 +4987,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5002,7 +5002,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5011,7 +5011,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5026,7 +5026,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5038,10 +5038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5053,7 +5053,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5104,7 +5104,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5125,13 +5125,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5320,10 +5320,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5332,7 +5332,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5350,7 +5350,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5359,7 +5359,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5377,7 +5377,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5395,7 +5395,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -5413,7 +5413,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5440,7 +5440,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5455,10 +5455,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5467,7 +5467,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5479,7 +5479,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5497,7 +5497,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5515,7 +5515,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5536,7 +5536,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5551,7 +5551,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5566,7 +5566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5587,7 +5587,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5608,7 +5608,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5629,7 +5629,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5650,7 +5650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5674,7 +5674,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5698,7 +5698,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5722,7 +5722,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5746,7 +5746,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5770,7 +5770,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5794,7 +5794,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5815,7 +5815,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5836,7 +5836,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5905,7 +5905,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5932,7 +5932,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5953,7 +5953,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5965,7 +5965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5983,7 +5983,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6392,15 +6392,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6428,60 +6419,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6491,69 +6428,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6563,69 +6437,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6635,15 +6446,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6662,15 +6464,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6689,15 +6482,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6815,24 +6599,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6851,27 +6617,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 8,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6887,15 +6635,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6907,7 +6646,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 8,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6923,15 +6662,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6941,15 +6671,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6959,60 +6680,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/64/arm64_armv8-a/source-based/libjnigraphics.so.lsdump b/30/64/arm64_armv8-a/source-based/libjnigraphics.so.lsdump
index 9f5b571..a393ffd 100644
--- a/30/64/arm64_armv8-a/source-based/libjnigraphics.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libjnigraphics.so.lsdump
@@ -9437,7 +9437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm64_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -10084,15 +10084,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm64_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm64_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 8,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -11116,7 +11107,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm64_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 8,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19835,11 +19826,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -26467,7 +26453,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm64_armv8-a/source-based/liblog.so.lsdump b/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
index 95bdf75..64b26bb 100644
--- a/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -1860,7 +1860,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "/system/core/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -1905,7 +1905,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIPm",
    "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -1928,12 +1928,14 @@
    "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK11EventTagMap",
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "size" : 208,
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2013,7 +2015,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/arm64_armv8-a/source-based/libm.so.lsdump b/30/64/arm64_armv8-a/source-based/libm.so.lsdump
index f95cf5f..bd032da 100644
--- a/30/64/arm64_armv8-a/source-based/libm.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libm.so.lsdump
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA2_d",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
   },
   {
    "alignment" : 16,
@@ -242,7 +242,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA2_f",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
   },
   {
    "alignment" : 4,
@@ -5014,7 +5014,7 @@
    "referenced_type" : "_ZTIe",
    "self_type" : "_ZTIPe",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-netbsd/lib/libm/complex/cephes_subrl.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 8,
@@ -5183,7 +5183,7 @@
    "referenced_type" : "_ZTIA2_e",
    "self_type" : "_ZTIA2_Ke",
    "size" : 32,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodl.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_modfl.c"
   },
   {
    "alignment" : 4,
@@ -5429,7 +5429,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_cosh.c"
   },
   {
    "alignment" : 16,
@@ -5439,7 +5439,7 @@
    "referenced_type" : "_ZTIe",
    "self_type" : "_ZTIKe",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-netbsd/lib/libm/complex/cephes_subrl.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_asinhl.c"
   },
   {
    "alignment" : 4,
@@ -5449,7 +5449,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_atanhf.c"
   },
   {
    "alignment" : 4,
@@ -5470,7 +5470,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
   },
   {
    "alignment" : 16,
@@ -5492,7 +5492,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
   },
   {
    "alignment" : 8,
@@ -5502,7 +5502,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acos.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_atan2.c"
   },
   {
    "alignment" : 16,
@@ -5522,7 +5522,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_atan2f.c"
   }
  ],
  "record_types" :
@@ -6641,7 +6641,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -6663,7 +6663,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/64/arm64_armv8-a/source-based/libmediandk.so.lsdump b/30/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
index 591cdcc..e64b1f1 100644
--- a/30/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
@@ -356,11 +356,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 3072,
+   "size" : 7168,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7037,6 +7046,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7140,27 +7170,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7763,7 +7772,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7818,7 +7827,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19039,7 +19048,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19054,7 +19063,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19072,7 +19081,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19087,7 +19096,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19105,7 +19114,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19177,7 +19186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19243,7 +19252,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19258,7 +19267,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20074,7 +20083,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20107,7 +20116,7 @@
      "referenced_type" : "_ZTIm"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20800,7 +20809,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20824,7 +20833,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20848,7 +20857,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20914,7 +20923,7 @@
      "referenced_type" : "_ZTIm"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20998,7 +21007,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21046,7 +21055,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21058,10 +21067,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21073,7 +21082,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21085,7 +21094,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21106,7 +21115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21124,7 +21133,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21142,7 +21151,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21160,7 +21169,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21178,7 +21187,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21205,7 +21214,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21223,7 +21232,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21238,7 +21247,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21247,7 +21256,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21268,7 +21277,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21286,7 +21295,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21304,7 +21313,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21322,7 +21331,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21340,7 +21349,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21367,7 +21376,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21385,7 +21394,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21403,7 +21412,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21418,7 +21427,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIl",
@@ -22410,96 +22419,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22545,42 +22464,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22910,7 +22793,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 8,
@@ -23127,41 +23010,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23244,51 +23092,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23298,15 +23101,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23496,6 +23290,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23939,7 +23742,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27306,24 +27109,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27549,42 +27334,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28418,7 +28167,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 8,
@@ -28521,15 +28270,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28566,24 +28306,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31223,7 +30945,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 8,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31277,7 +30999,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 8,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31311,42 +31033,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32145,7 +31831,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 216,
+   "size" : 280,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32313,7 +31999,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32403,7 +32089,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 184,
+   "size" : 248,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33054,7 +32740,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33163,7 +32849,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 40,
+   "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33189,16 +32875,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34169,7 +33845,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34179,46 +33855,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 8,
@@ -34279,96 +33915,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 8,
@@ -35119,11 +34665,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39812,38 +39353,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -40016,22 +39525,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1664,
+     "field_offset" : 2176,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1672,
+     "field_offset" : 2184,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1680,
+     "field_offset" : 2192,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1696,
+     "field_offset" : 2208,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -40040,7 +39549,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 216,
+   "size" : 280,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45327,14 +44836,8 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1792,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1824,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIj"
     },
     {
@@ -45342,12 +44845,6 @@
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1856,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvmEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 2048,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45355,7 +44852,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48192,6 +47689,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EEE",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -49991,12 +49527,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 768,
+     "field_offset" : 1280,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 832,
+     "field_offset" : 1344,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -50004,7 +49540,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 184,
+   "size" : 248,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -53020,10 +52556,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -53033,10 +52566,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53046,7 +52576,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm64_armv8-a_shared_cfi/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -54004,7 +53534,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELm4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -54012,7 +53542,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 40,
+   "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54501,60 +54031,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55353,7 +54829,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 48,
+   "size" : 112,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55591,325 +55067,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 26304,
+     "field_offset" : 59072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 26336,
+     "field_offset" : 59104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 26368,
+     "field_offset" : 59136,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 26432,
+     "field_offset" : 59200,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 26496,
+     "field_offset" : 59264,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 26560,
+     "field_offset" : 59328,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 26624,
+     "field_offset" : 59392,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 27264,
+     "field_offset" : 60032,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 27392,
+     "field_offset" : 60160,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 27424,
+     "field_offset" : 60192,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 27456,
+     "field_offset" : 60224,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 27488,
+     "field_offset" : 60256,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 27520,
+     "field_offset" : 60288,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 27552,
+     "field_offset" : 60320,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 27584,
+     "field_offset" : 60352,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 27616,
+     "field_offset" : 60384,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 27648,
+     "field_offset" : 60416,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 27656,
+     "field_offset" : 60424,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 27664,
+     "field_offset" : 60432,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 27680,
+     "field_offset" : 60448,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 28000,
+     "field_offset" : 60768,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 29120,
+     "field_offset" : 61888,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 29184,
+     "field_offset" : 61952,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 29248,
+     "field_offset" : 62016,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 29312,
+     "field_offset" : 62080,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 29376,
+     "field_offset" : 62144,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iSt9__va_listEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 29440,
+     "field_offset" : 62208,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 29504,
+     "field_offset" : 62272,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 29568,
+     "field_offset" : 62336,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 29632,
+     "field_offset" : 62400,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 29696,
+     "field_offset" : 62464,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 29760,
+     "field_offset" : 62528,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 29824,
+     "field_offset" : 62592,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 30144,
+     "field_offset" : 63424,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 30208,
+     "field_offset" : 63488,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 30240,
+     "field_offset" : 63520,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 30248,
+     "field_offset" : 63528,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 30256,
+     "field_offset" : 63536,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 30272,
+     "field_offset" : 63552,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 30304,
+     "field_offset" : 63584,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 30336,
+     "field_offset" : 63616,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 30400,
+     "field_offset" : 63680,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 30464,
+     "field_offset" : 63744,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 30528,
+     "field_offset" : 63808,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 30912,
+     "field_offset" : 64192,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 30976,
+     "field_offset" : 64256,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 31040,
+     "field_offset" : 64320,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 31048,
+     "field_offset" : 64328,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 31056,
+     "field_offset" : 64336,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 31104,
+     "field_offset" : 64384,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 31168,
+     "field_offset" : 64448,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 31232,
+     "field_offset" : 64512,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 31424,
+     "field_offset" : 64704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 31488,
+     "field_offset" : 64768,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55918,7 +55394,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 3944,
+   "size" : 8104,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56830,7 +56306,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56870,7 +56346,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56910,7 +56386,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56950,7 +56426,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E",
@@ -56990,7 +56466,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -57030,7 +56506,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57070,7 +56546,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57110,7 +56586,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57150,7 +56626,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57193,7 +56669,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57233,7 +56709,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58923,6 +58399,32 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lm4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELm4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELm4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELm4EEE",
+   "size" : 104,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "_ZTIN7android11FlattenableINS_9FenceTime8SnapshotEEE"
     }
    ],
@@ -59053,7 +58555,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm64_armv8-a/source-based/libnativewindow.so.lsdump b/30/64/arm64_armv8-a/source-based/libnativewindow.so.lsdump
index ae99bc6..6a43afc 100644
--- a/30/64/arm64_armv8-a/source-based/libnativewindow.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libnativewindow.so.lsdump
@@ -1194,6 +1194,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1249,27 +1270,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1760,7 +1760,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2658,15 +2658,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm64_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2859,7 +2850,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/arm64_armv8-a/source-based/libneuralnetworks.so.lsdump b/30/64/arm64_armv8-a/source-based/libneuralnetworks.so.lsdump
index 72d0040..6a9d48d 100644
--- a/30/64/arm64_armv8-a/source-based/libneuralnetworks.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libneuralnetworks.so.lsdump
@@ -2453,24 +2453,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2480,24 +2462,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2507,24 +2471,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2534,24 +2480,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2561,24 +2489,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2588,24 +2498,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2615,24 +2507,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2642,24 +2516,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2687,33 +2543,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2723,33 +2552,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2804,24 +2606,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2831,24 +2615,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2858,24 +2624,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2885,24 +2633,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2912,24 +2642,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2939,24 +2651,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2966,24 +2660,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2993,24 +2669,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3174,36 +2832,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 8,
@@ -3214,36 +2842,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm64_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 8,
diff --git a/30/64/arm64_armv8-a/source-based/libvulkan.so.lsdump b/30/64/arm64_armv8-a/source-based/libvulkan.so.lsdump
index 2cb1b16..939c037 100644
--- a/30/64/arm64_armv8-a/source-based/libvulkan.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 256,
@@ -873,27 +801,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11522,16 +11438,16 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkSwapchainKHR_T"
     },
     {
      "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP13VkSemaphore_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -11603,7 +11519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11621,10 +11537,10 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -11660,10 +11576,10 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -11696,7 +11612,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -11717,7 +11633,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11735,13 +11651,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
     },
     {
-     "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPipelineLayout_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11768,10 +11684,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -11789,13 +11705,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
     },
     {
-     "referenced_type" : "_ZTIP12VkPipeline_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP12VkPipeline_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -11807,7 +11723,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11831,16 +11747,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11864,7 +11780,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11888,10 +11804,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11915,10 +11831,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11942,13 +11858,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11966,13 +11882,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11993,16 +11909,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -12023,16 +11939,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12050,7 +11966,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -12062,7 +11978,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12083,7 +11999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12104,7 +12020,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12134,10 +12050,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12152,7 +12068,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12176,7 +12092,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12203,10 +12119,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12227,10 +12143,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12251,7 +12167,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -12269,7 +12185,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12281,13 +12197,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12299,10 +12215,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12323,7 +12239,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12338,7 +12254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12377,10 +12293,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPipelineLayout_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12404,7 +12320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP9VkEvent_T"
@@ -12422,7 +12338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -12443,16 +12359,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -12473,7 +12389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12488,7 +12404,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12509,7 +12425,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12527,7 +12443,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12542,7 +12458,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP9VkEvent_T"
@@ -12560,7 +12476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12575,7 +12491,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12596,7 +12512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12614,7 +12530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12632,7 +12548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12650,7 +12566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12671,10 +12587,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12695,7 +12611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12737,7 +12653,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12932,7 +12848,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13295,7 +13211,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13313,7 +13229,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkBufferView_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13331,7 +13247,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13349,7 +13265,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkDescriptorPool_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13367,7 +13283,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13436,7 +13352,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13454,7 +13370,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkFramebuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkFramebuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13472,7 +13388,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13490,7 +13406,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP13VkImageView_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13523,7 +13439,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP12VkPipeline_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP12VkPipeline_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13559,7 +13475,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPipelineLayout_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13595,7 +13511,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkRenderPass_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkRenderPass_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13613,7 +13529,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP11VkSampler_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13631,7 +13547,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13649,7 +13565,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP13VkSemaphore_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13667,7 +13583,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkShaderModule_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkShaderModule_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13685,7 +13601,7 @@
      "referenced_type" : "_ZTIP12VkInstance_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13703,7 +13619,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkSwapchainKHR_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13730,7 +13646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13742,7 +13658,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13763,7 +13679,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13883,13 +13799,13 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -13904,7 +13820,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkDescriptorPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -13925,7 +13841,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13961,7 +13877,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP20VkMemoryRequirements"
@@ -14054,7 +13970,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14072,7 +13988,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -14159,7 +14075,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -14174,7 +14090,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIP20VkMemoryRequirements"
@@ -14210,7 +14126,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14252,7 +14168,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkImageSubresource"
@@ -14303,7 +14219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14321,7 +14237,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14339,7 +14255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14357,7 +14273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14372,7 +14288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14387,7 +14303,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14405,7 +14321,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14423,7 +14339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14453,7 +14369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14471,7 +14387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14486,7 +14402,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14501,10 +14417,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14522,7 +14438,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14537,7 +14453,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14552,7 +14468,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14570,7 +14486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14588,7 +14504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14621,7 +14537,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14642,10 +14558,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIP24VkSurfaceCapabilitiesKHR"
@@ -14660,10 +14576,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14681,10 +14597,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14702,13 +14618,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14780,7 +14696,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkRenderPass_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkRenderPass_T"
     },
     {
      "referenced_type" : "_ZTIP10VkExtent2D"
@@ -14798,7 +14714,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkSwapchainKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14837,7 +14753,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -14891,7 +14807,7 @@
      "referenced_type" : "_ZTIPK16VkBindSparseInfo"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -14927,7 +14843,7 @@
      "referenced_type" : "_ZTIPK12VkSubmitInfo"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -14951,7 +14867,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14969,7 +14885,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14987,7 +14903,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkDescriptorPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15053,7 +14969,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15071,7 +14987,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15086,7 +15002,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkDescriptorSet_T"
     },
     {
      "referenced_type" : "_ZTIP28VkDescriptorUpdateTemplate_T"
@@ -15990,15 +15906,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -17124,15 +17031,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP10VkBuffer_T",
-   "name" : "VkBuffer_T *const *",
-   "referenced_type" : "_ZTIKP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP11VkSampler_T",
    "name" : "VkSampler_T *const *",
    "referenced_type" : "_ZTIKP11VkSampler_T",
@@ -17142,78 +17040,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP13VkImageView_T",
    "name" : "VkImageView_T *const *",
    "referenced_type" : "_ZTIKP13VkImageView_T",
@@ -17223,78 +17049,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
    "name" : "VkSemaphore_T *const *",
    "referenced_type" : "_ZTIKP13VkSemaphore_T",
@@ -17304,78 +17058,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP14VkBufferView_T",
    "name" : "VkBufferView_T *const *",
    "referenced_type" : "_ZTIKP14VkBufferView_T",
@@ -17385,78 +17067,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
    "name" : "VkSwapchainKHR_T *const *",
    "referenced_type" : "_ZTIKP16VkSwapchainKHR_T",
@@ -17466,78 +17076,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const *",
    "referenced_type" : "_ZTIKP17VkCommandBuffer_T",
@@ -17547,78 +17085,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP17VkDescriptorSet_T",
    "name" : "VkDescriptorSet_T *const *",
    "referenced_type" : "_ZTIKP17VkDescriptorSet_T",
@@ -17628,15 +17094,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkDescriptorSet_T",
-   "name" : "VkDescriptorSet_T *const *",
-   "referenced_type" : "_ZTIKP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP17VkPipelineCache_T",
    "name" : "VkPipelineCache_T *const *",
    "referenced_type" : "_ZTIKP17VkPipelineCache_T",
@@ -17646,15 +17103,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkPipelineCache_T",
-   "name" : "VkPipelineCache_T *const *",
-   "referenced_type" : "_ZTIKP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -17664,78 +17112,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
    "name" : "VkDescriptorSetLayout_T *const *",
    "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T",
@@ -17745,78 +17121,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
    "name" : "VkAccelerationStructureNV_T *const *",
    "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T",
@@ -17826,78 +17130,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP9VkEvent_T",
    "name" : "VkEvent_T *const *",
    "referenced_type" : "_ZTIKP9VkEvent_T",
@@ -17907,15 +17139,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP9VkEvent_T",
-   "name" : "VkEvent_T *const *",
-   "referenced_type" : "_ZTIKP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP9VkFence_T",
    "name" : "VkFence_T *const *",
    "referenced_type" : "_ZTIKP9VkFence_T",
@@ -17925,15 +17148,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP9VkFence_T",
-   "name" : "VkFence_T *const *",
-   "referenced_type" : "_ZTIKP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17999,7 +17213,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP10VkBuffer_T",
    "name" : "VkBuffer_T **",
-   "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP10VkBuffer_T",
    "self_type" : "_ZTIPP10VkBuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18015,18 +17229,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP11VkSampler_T",
    "name" : "VkSampler_T **",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP11VkSampler_T",
    "self_type" : "_ZTIPP11VkSampler_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18042,18 +17247,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP12VkPipeline_T",
    "name" : "VkPipeline_T **",
-   "referenced_type" : "_ZTIP12VkPipeline_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP12VkPipeline_T",
    "self_type" : "_ZTIPP12VkPipeline_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18062,7 +17258,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP13VkImageView_T",
    "name" : "VkImageView_T **",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP13VkImageView_T",
    "self_type" : "_ZTIPP13VkImageView_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18078,18 +17274,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP13VkQueryPool_T",
-   "name" : "VkQueryPool_T **",
-   "referenced_type" : "_ZTIP13VkQueryPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP13VkQueryPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP13VkSemaphore_T",
    "name" : "VkSemaphore_T **",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP13VkSemaphore_T",
    "self_type" : "_ZTIPP13VkSemaphore_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18098,7 +17285,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP14VkBufferView_T",
    "name" : "VkBufferView_T **",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP14VkBufferView_T",
    "self_type" : "_ZTIPP14VkBufferView_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18107,7 +17294,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP14VkRenderPass_T",
    "name" : "VkRenderPass_T **",
-   "referenced_type" : "_ZTIP14VkRenderPass_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP14VkRenderPass_T",
    "self_type" : "_ZTIPP14VkRenderPass_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18116,7 +17303,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP14VkSurfaceKHR_T",
    "name" : "VkSurfaceKHR_T **",
-   "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP14VkSurfaceKHR_T",
    "self_type" : "_ZTIPP14VkSurfaceKHR_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -18125,7 +17312,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -18134,7 +17321,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP15VkCommandPool_T",
    "name" : "VkCommandPool_T **",
-   "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15VkCommandPool_T",
    "self_type" : "_ZTIPP15VkCommandPool_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18143,7 +17330,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP15VkFramebuffer_T",
    "name" : "VkFramebuffer_T **",
-   "referenced_type" : "_ZTIP15VkFramebuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15VkFramebuffer_T",
    "self_type" : "_ZTIPP15VkFramebuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18152,7 +17339,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP16VkDeviceMemory_T",
    "name" : "VkDeviceMemory_T **",
-   "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP16VkDeviceMemory_T",
    "self_type" : "_ZTIPP16VkDeviceMemory_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18161,7 +17348,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP16VkShaderModule_T",
    "name" : "VkShaderModule_T **",
-   "referenced_type" : "_ZTIP16VkShaderModule_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP16VkShaderModule_T",
    "self_type" : "_ZTIPP16VkShaderModule_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18170,7 +17357,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP16VkSwapchainKHR_T",
    "name" : "VkSwapchainKHR_T **",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP16VkSwapchainKHR_T",
    "self_type" : "_ZTIPP16VkSwapchainKHR_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18179,7 +17366,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18188,7 +17375,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP17VkDescriptorSet_T",
    "name" : "VkDescriptorSet_T **",
-   "referenced_type" : "_ZTIP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkDescriptorSet_T",
    "self_type" : "_ZTIPP17VkDescriptorSet_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18204,18 +17391,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP17VkPipelineCache_T",
-   "name" : "VkPipelineCache_T **",
-   "referenced_type" : "_ZTIP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP18VkDescriptorPool_T",
    "name" : "VkDescriptorPool_T **",
-   "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkDescriptorPool_T",
    "self_type" : "_ZTIPP18VkDescriptorPool_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18224,7 +17402,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18233,7 +17411,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP18VkPipelineLayout_T",
    "name" : "VkPipelineLayout_T **",
-   "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPipelineLayout_T",
    "self_type" : "_ZTIPP18VkPipelineLayout_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18242,7 +17420,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP23VkDescriptorSetLayout_T",
    "name" : "VkDescriptorSetLayout_T **",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T",
    "self_type" : "_ZTIPP23VkDescriptorSetLayout_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18251,7 +17429,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP26VkSamplerYcbcrConversion_T",
    "name" : "VkSamplerYcbcrConversion_T **",
-   "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T",
    "self_type" : "_ZTIPP26VkSamplerYcbcrConversion_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18267,15 +17445,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP28VkDescriptorUpdateTemplate_T",
-   "name" : "VkDescriptorUpdateTemplate_T **",
-   "referenced_type" : "_ZTIP28VkDescriptorUpdateTemplate_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP28VkDescriptorUpdateTemplate_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP9VkEvent_T",
    "name" : "VkEvent_T **",
    "referenced_type" : "_ZTIP9VkEvent_T",
@@ -18285,18 +17454,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP9VkEvent_T",
-   "name" : "VkEvent_T **",
-   "referenced_type" : "_ZTIP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP9VkFence_T",
    "name" : "VkFence_T **",
-   "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP9VkFence_T",
    "self_type" : "_ZTIPP9VkFence_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18305,7 +17465,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP9VkImage_T",
    "name" : "VkImage_T **",
-   "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP9VkImage_T",
    "self_type" : "_ZTIPP9VkImage_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18321,15 +17481,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -19730,7 +18881,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP10VkBuffer_T",
    "name" : "VkBuffer_T *const",
-   "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP10VkBuffer_T",
    "self_type" : "_ZTIKP10VkBuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -19740,86 +18891,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP11VkSampler_T",
    "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
    "referenced_type" : "_ZTIP11VkSampler_T",
    "self_type" : "_ZTIKP11VkSampler_T",
    "size" : 8,
@@ -19830,86 +18901,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP13VkImageView_T",
    "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
    "referenced_type" : "_ZTIP13VkImageView_T",
    "self_type" : "_ZTIKP13VkImageView_T",
    "size" : 8,
@@ -19920,86 +18911,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP13VkSemaphore_T",
    "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
    "referenced_type" : "_ZTIP13VkSemaphore_T",
    "self_type" : "_ZTIKP13VkSemaphore_T",
    "size" : 8,
@@ -20010,86 +18921,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP14VkBufferView_T",
    "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
    "referenced_type" : "_ZTIP14VkBufferView_T",
    "self_type" : "_ZTIKP14VkBufferView_T",
    "size" : 8,
@@ -20100,86 +18931,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
    "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
    "referenced_type" : "_ZTIP16VkSwapchainKHR_T",
    "self_type" : "_ZTIKP16VkSwapchainKHR_T",
    "size" : 8,
@@ -20190,86 +18941,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 8,
@@ -20280,7 +18951,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkDescriptorSet_T",
    "name" : "VkDescriptorSet_T *const",
-   "referenced_type" : "_ZTIP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkDescriptorSet_T",
    "self_type" : "_ZTIKP17VkDescriptorSet_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -20290,16 +18961,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkPipelineCache_T",
    "name" : "VkPipelineCache_T *const",
-   "referenced_type" : "_ZTIP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkPipelineCache_T",
-   "name" : "VkPipelineCache_T *const",
    "referenced_type" : "_ZTIP17VkPipelineCache_T",
    "self_type" : "_ZTIKP17VkPipelineCache_T",
    "size" : 8,
@@ -20310,86 +18971,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 8,
@@ -20400,86 +18981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
    "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
    "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T",
    "self_type" : "_ZTIKP23VkDescriptorSetLayout_T",
    "size" : 8,
@@ -20490,86 +18991,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
    "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
    "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T",
    "self_type" : "_ZTIKP27VkAccelerationStructureNV_T",
    "size" : 8,
@@ -20580,16 +19001,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP9VkEvent_T",
    "name" : "VkEvent_T *const",
-   "referenced_type" : "_ZTIP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP9VkEvent_T",
-   "name" : "VkEvent_T *const",
    "referenced_type" : "_ZTIP9VkEvent_T",
    "self_type" : "_ZTIKP9VkEvent_T",
    "size" : 8,
@@ -20600,7 +19011,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP9VkFence_T",
    "name" : "VkFence_T *const",
-   "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm64_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP9VkFence_T",
    "self_type" : "_ZTIKP9VkFence_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
diff --git a/30/64/arm64_armv8-a/source-based/libz.so.lsdump b/30/64/arm64_armv8-a/source-based/libz.so.lsdump
index 9dc9981..7191580 100644
--- a/30/64/arm64_armv8-a/source-based/libz.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libz.so.lsdump
@@ -2137,7 +2137,7 @@
    "referenced_type" : "_ZTI10z_stream_s",
    "self_type" : "_ZTIP10z_stream_s",
    "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
+   "source_file" : "/external/zlib/zlib.h"
   },
   {
    "alignment" : 8,
@@ -2146,7 +2146,7 @@
    "referenced_type" : "_ZTI11gz_header_s",
    "self_type" : "_ZTIP11gz_header_s",
    "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
+   "source_file" : "/external/zlib/inflate.h"
   },
   {
    "alignment" : 8,
@@ -2240,42 +2240,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm64_armv8-a_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm64_armv8-a_static/obj/external/zlib/crc32.sdump",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm64_armv8-a_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm64_armv8-a_static/obj/external/zlib/deflate.sdump",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm64_armv8-a_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm64_armv8-a_static/obj/external/zlib/trees.sdump",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
@@ -2344,7 +2308,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/external/zlib/gzguts.h"
+   "source_file" : "/external/zlib/zlib.h"
   },
   {
    "alignment" : 8,
@@ -2389,7 +2353,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
+   "source_file" : "/external/zlib/inftrees.h"
   },
   {
    "alignment" : 8,
@@ -2492,11 +2456,13 @@
    "source_file" : "/external/zlib/deflate.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK18static_tree_desc_s",
    "name" : "const static_tree_desc_s",
    "referenced_type" : "_ZTI18static_tree_desc_s",
    "self_type" : "_ZTIK18static_tree_desc_s",
+   "size" : 32,
    "source_file" : "/external/zlib/deflate.h"
   },
   {
diff --git a/30/64/arm_armv7-a-neon/source-based/libEGL.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libEGL.so.lsdump
index 2282700..6745ccf 100644
--- a/30/64/arm_armv7-a-neon/source-based/libEGL.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libEGL.so.lsdump
@@ -2021,15 +2021,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
index 42b858c..c77822d 100644
--- a/30/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
@@ -5892,10 +5892,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26106,24 +26106,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26322,15 +26304,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26340,15 +26313,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26358,15 +26322,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26439,15 +26394,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26457,15 +26403,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26475,15 +26412,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26493,15 +26421,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26511,15 +26430,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26529,15 +26439,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36513,6 +36414,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38056,14 +37966,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38080,14 +37982,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38104,14 +37998,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38120,14 +38006,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38144,14 +38022,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38160,14 +38030,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38176,14 +38038,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38200,14 +38054,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38216,14 +38062,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38240,14 +38078,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39547,7 +39377,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39607,7 +39437,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41391,16 +41221,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43234,11 +43054,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52883,8 +52698,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52893,7 +52714,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54701,74 +54522,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4032,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4480,
+     "field_offset" : 5376,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5472,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54777,7 +54622,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55159,6 +55004,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57742,6 +57641,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57781,6 +57684,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67683,6 +67590,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67722,6 +67633,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68773,6 +68688,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68812,6 +68731,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76689,7 +76612,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
index 5f4a71d..473201b 100644
--- a/30/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
@@ -5928,10 +5928,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26214,24 +26214,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26430,15 +26412,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26448,15 +26421,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26466,15 +26430,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26547,15 +26502,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26565,15 +26511,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26583,15 +26520,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26601,15 +26529,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26619,15 +26538,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26637,15 +26547,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv7-a-neon_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36621,6 +36522,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38164,14 +38074,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38188,14 +38090,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38212,14 +38106,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38228,14 +38114,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38252,14 +38130,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38268,14 +38138,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38284,14 +38146,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38308,14 +38162,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38324,14 +38170,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38348,14 +38186,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39655,7 +39485,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39715,7 +39545,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41499,16 +41329,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv7-a-neon_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43342,11 +43162,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52991,8 +52806,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53001,7 +52822,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54809,74 +54630,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4032,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4480,
+     "field_offset" : 5376,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5472,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54885,7 +54730,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55267,6 +55112,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57850,6 +57749,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57889,6 +57792,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67791,6 +67698,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67830,6 +67741,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68881,6 +68796,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68920,6 +68839,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76797,7 +76720,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
index 549fa2d..b316005 100644
--- a/30/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
@@ -443,7 +443,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -537,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -616,7 +616,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/64/arm_armv7-a-neon/source-based/libandroid.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libandroid.so.lsdump
index 13abbdc..aa487be 100644
--- a/30/64/arm_armv7-a-neon/source-based/libandroid.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libandroid.so.lsdump
@@ -1891,6 +1891,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1946,27 +1967,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2277,7 +2277,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2743,51 +2743,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2971,7 +2926,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index e54b3a2..0a485ef 100644
--- a/30/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -3144,7 +3144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3744,7 +3744,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6263,7 +6263,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6377,7 +6377,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6389,7 +6389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6461,7 +6461,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6515,7 +6515,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6533,7 +6533,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6542,7 +6542,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6554,7 +6554,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6566,7 +6566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6581,7 +6581,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6602,7 +6602,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6617,7 +6617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6635,7 +6635,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6650,7 +6650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6668,7 +6668,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6683,7 +6683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6701,7 +6701,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6716,7 +6716,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6734,7 +6734,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6749,7 +6749,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6767,7 +6767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPx"
@@ -6782,7 +6782,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6800,7 +6800,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6815,7 +6815,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6836,7 +6836,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6851,7 +6851,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6869,7 +6869,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6890,10 +6890,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6905,7 +6905,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6920,7 +6920,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6938,7 +6938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPy"
@@ -6953,7 +6953,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6971,7 +6971,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6986,7 +6986,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7001,7 +7001,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7022,7 +7022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7037,7 +7037,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7055,7 +7055,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7070,7 +7070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7088,7 +7088,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7103,7 +7103,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7121,7 +7121,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7136,7 +7136,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7154,7 +7154,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7169,7 +7169,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7187,7 +7187,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIx"
@@ -7202,7 +7202,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKx"
@@ -7220,7 +7220,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7235,7 +7235,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7256,7 +7256,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7271,7 +7271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7289,7 +7289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7310,10 +7310,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7325,7 +7325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7340,7 +7340,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7358,7 +7358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -7373,7 +7373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKy"
@@ -7391,7 +7391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7409,7 +7409,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7421,7 +7421,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7430,7 +7430,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7457,7 +7457,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7472,7 +7472,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7484,7 +7484,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7499,7 +7499,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7511,7 +7511,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7520,7 +7520,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7532,7 +7532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7544,7 +7544,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7556,7 +7556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7568,7 +7568,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7580,7 +7580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7589,7 +7589,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9975,15 +9975,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10029,24 +10020,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10056,24 +10029,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10083,15 +10038,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10218,15 +10164,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10236,15 +10173,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10272,24 +10200,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/64/arm_armv7-a-neon/source-based/libc.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libc.so.lsdump
index 1ffb0ed..b38b96a 100644
--- a/30/64/arm_armv7-a-neon/source-based/libc.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libc.so.lsdump
@@ -262,15 +262,6 @@
    "source_file" : "/bionic/libc/include/signal.h"
   },
   {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIA84_c",
-   "name" : "char [84]",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIA84_c",
-   "size" : 84,
-   "source_file" : "/bionic/libc/include/bits/struct_file.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA8_6fp_reg",
    "name" : "fp_reg [8]",
@@ -325,13 +316,6 @@
    "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_info.h"
   },
   {
-   "linker_set_key" : "_ZTIA_7__sFILE",
-   "name" : "__sFILE []",
-   "referenced_type" : "_ZTI7__sFILE",
-   "self_type" : "_ZTIA_7__sFILE",
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
    "linker_set_key" : "_ZTIA_Pc",
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
@@ -6938,11 +6922,11 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIFvvE",
-   "name" : "void ()",
+   "name" : "void (void)",
    "referenced_type" : "_ZTIFvvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvvE",
-   "source_file" : "/bionic/libc/include/bits/signal_types.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   }
  ],
  "functions" :
@@ -7076,7 +7060,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7100,7 +7084,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7124,7 +7108,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -8546,7 +8530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -8561,7 +8545,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8579,7 +8563,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPj",
@@ -8615,7 +8599,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8630,7 +8614,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8645,7 +8629,7 @@
      "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8696,7 +8680,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -8765,7 +8749,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9689,7 +9673,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -10010,7 +9994,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -10025,7 +10009,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11876,7 +11860,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -12251,7 +12235,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_arm_armv7-a-neon_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -12527,7 +12511,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12542,7 +12526,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13458,12 +13442,6 @@
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
-   "linker_set_key" : "__sF",
-   "name" : "__sF",
-   "referenced_type" : "_ZTIA_7__sFILE",
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
    "linker_set_key" : "_ctype_",
    "name" : "_ctype_",
    "referenced_type" : "_ZTIPKc",
@@ -13974,7 +13952,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14195,11 +14173,11 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvvE",
-   "name" : "void (*)()",
+   "name" : "void (*)(void)",
    "referenced_type" : "_ZTIFvvE",
    "self_type" : "_ZTIPFvvE",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/signal_types.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14212,375 +14190,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/arch-arm/bionic/exidx_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/arch-arm/bionic/exidx_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv7-a-neon_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm_armv7-a-neon_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm_armv7-a-neon_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK10sigset64_t",
    "name" : "const sigset64_t *",
    "referenced_type" : "_ZTIK10sigset64_t",
@@ -14671,24 +14280,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -14698,24 +14289,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv7-a-neon_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -14739,7 +14312,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14752,15 +14325,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm_armv7-a-neon_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm_armv7-a-neon_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14847,7 +14411,7 @@
    "referenced_type" : "_ZTIKPc",
    "self_type" : "_ZTIPKPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/getopt.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14865,7 +14429,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -14892,7 +14456,7 @@
    "referenced_type" : "_ZTIKj",
    "self_type" : "_ZTIPKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -14901,7 +14465,7 @@
    "referenced_type" : "_ZTIKl",
    "self_type" : "_ZTIPKl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -15027,7 +14591,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -15054,7 +14618,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/time.h"
   },
   {
    "alignment" : 4,
@@ -15072,7 +14636,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -15081,7 +14645,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -15127,106 +14691,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv7-a-neon_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv7-a-neon_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv7-a-neon_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm_armv7-a-neon_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm_armv7-a-neon_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
@@ -15400,7 +14864,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -15568,7 +15032,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -15598,7 +15062,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -15608,7 +15072,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIKl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -16056,7 +15520,7 @@
    [
     {
      "field_name" : "fpregs",
-     "referenced_type" : "_ZTIA8_N11user_fpregs6fp_regE"
+     "referenced_type" : "_ZTIA8_6fp_reg"
     },
     {
      "field_name" : "fpsr",
@@ -18309,22 +17773,6 @@
    "fields" :
    [
     {
-     "field_name" : "__private",
-     "referenced_type" : "_ZTIA84_c"
-    }
-   ],
-   "linker_set_key" : "_ZTI7__sFILE",
-   "name" : "__sFILE",
-   "referenced_type" : "_ZTI7__sFILE",
-   "self_type" : "_ZTI7__sFILE",
-   "size" : 84,
-   "source_file" : "/bionic/libc/include/bits/struct_file.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "cmsg_len",
      "referenced_type" : "_ZTIj"
     },
diff --git a/30/64/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump
index 212f374..0e05642 100644
--- a/30/64/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libcamera2ndk.so.lsdump
@@ -2594,6 +2594,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3128,27 +3149,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4888,7 +4888,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4900,7 +4900,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4909,7 +4909,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4924,7 +4924,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4936,10 +4936,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4951,7 +4951,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4960,7 +4960,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4975,7 +4975,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4984,7 +4984,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4999,7 +4999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5008,7 +5008,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5023,7 +5023,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5035,10 +5035,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5050,7 +5050,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5101,7 +5101,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5122,13 +5122,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5317,10 +5317,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5329,7 +5329,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5347,7 +5347,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5356,7 +5356,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5374,7 +5374,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5392,7 +5392,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -5410,7 +5410,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5437,7 +5437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5452,10 +5452,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5464,7 +5464,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5476,7 +5476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5494,7 +5494,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5512,7 +5512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5533,7 +5533,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5548,7 +5548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5563,7 +5563,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5584,7 +5584,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5605,7 +5605,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5626,7 +5626,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5647,7 +5647,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5671,7 +5671,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5695,7 +5695,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5719,7 +5719,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5743,7 +5743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5767,7 +5767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5791,7 +5791,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5812,7 +5812,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5833,7 +5833,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5902,7 +5902,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5929,7 +5929,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5950,7 +5950,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5962,7 +5962,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5980,7 +5980,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6389,15 +6389,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6425,60 +6416,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6488,69 +6425,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6560,69 +6434,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6632,15 +6443,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6659,15 +6461,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6686,15 +6479,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6812,24 +6596,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6848,27 +6614,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6884,15 +6632,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6904,7 +6643,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6920,15 +6659,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6938,15 +6668,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6956,60 +6677,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv7-a-neon_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/64/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump
index ec26307..c0123c0 100644
--- a/30/64/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libjnigraphics.so.lsdump
@@ -9396,7 +9396,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -10043,15 +10043,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 4,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -11048,7 +11039,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv7-a-neon_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 4,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19835,11 +19826,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -26342,7 +26328,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump b/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
index 3e3856d..81e148c 100644
--- a/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
@@ -1825,7 +1825,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1879,7 +1879,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1924,7 +1924,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1947,12 +1947,14 @@
    "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK11EventTagMap",
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
+   "size" : 116,
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2032,7 +2034,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/arm_armv7-a-neon/source-based/libm.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libm.so.lsdump
index 1f09b33..3db175b 100644
--- a/30/64/arm_armv7-a-neon/source-based/libm.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libm.so.lsdump
@@ -143,7 +143,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA2_d",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
   },
   {
    "alignment" : 8,
@@ -161,7 +161,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA2_f",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
   },
   {
    "alignment" : 4,
@@ -233,7 +233,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA5_d",
    "size" : 40,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/external/arm-optimized-routines/math/math_config.h"
   },
   {
    "alignment" : 4,
@@ -242,7 +242,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA5_f",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 8,
@@ -269,7 +269,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA6_d",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/external/arm-optimized-routines/math/math_config.h"
   },
   {
    "alignment" : 4,
@@ -4416,7 +4416,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIPd",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4452,7 +4452,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/fenv.h"
   },
   {
    "alignment" : 4,
@@ -4584,7 +4584,7 @@
    "referenced_type" : "_ZTIA5_f",
    "self_type" : "_ZTIA5_Kf",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4604,7 +4604,7 @@
    "referenced_type" : "_ZTIA6_d",
    "self_type" : "_ZTIA6_Kd",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4732,7 +4732,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atan.c"
   },
   {
    "alignment" : 8,
@@ -4752,7 +4752,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4762,7 +4762,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cbrt.c"
   },
   {
    "alignment" : 8,
@@ -4773,7 +4773,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_tanh.c"
   },
   {
    "alignment" : 4,
@@ -4784,7 +4784,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_tanhf.c"
   },
   {
    "alignment" : 8,
@@ -4794,7 +4794,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acos.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_log10.c"
   },
   {
    "alignment" : 4,
@@ -4804,7 +4804,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_expm1f.c"
   }
  ],
  "record_types" :
@@ -5701,7 +5701,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -5723,7 +5723,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
index f790703..5169eb4 100644
--- a/30/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
@@ -347,11 +347,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 1536,
+   "size" : 5632,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7028,6 +7037,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7131,27 +7161,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7754,7 +7763,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7809,7 +7818,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19015,7 +19024,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19030,7 +19039,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19048,7 +19057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19063,7 +19072,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19081,7 +19090,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19153,7 +19162,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19219,7 +19228,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19234,7 +19243,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20050,7 +20059,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20083,7 +20092,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20776,7 +20785,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20800,7 +20809,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20824,7 +20833,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20890,7 +20899,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20974,7 +20983,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21022,7 +21031,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21034,10 +21043,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21049,7 +21058,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21061,7 +21070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21082,7 +21091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21100,7 +21109,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21118,7 +21127,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21136,7 +21145,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21154,7 +21163,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21181,7 +21190,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21199,7 +21208,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21214,7 +21223,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21223,7 +21232,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21244,7 +21253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21262,7 +21271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21280,7 +21289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21298,7 +21307,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21316,7 +21325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21343,7 +21352,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21361,7 +21370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21379,7 +21388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21394,7 +21403,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIi",
@@ -22386,96 +22395,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22521,42 +22440,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22886,7 +22769,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -23103,41 +22986,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23220,51 +23068,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23274,15 +23077,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23472,6 +23266,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23915,7 +23718,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27282,24 +27085,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27525,42 +27310,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28394,7 +28143,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -28497,15 +28246,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28542,24 +28282,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31199,7 +30921,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31253,7 +30975,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31287,42 +31009,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32112,7 +31798,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 168,
+   "size" : 232,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32280,7 +31966,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32370,7 +32056,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33021,7 +32707,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33130,7 +32816,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33156,16 +32842,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34136,7 +33812,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34146,46 +33822,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 4,
@@ -34246,96 +33882,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -35076,11 +34622,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39769,38 +39310,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -39973,22 +39482,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
+     "field_offset" : 1760,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
+     "field_offset" : 1768,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1264,
+     "field_offset" : 1776,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1280,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -39997,7 +39506,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 168,
+   "size" : 232,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45284,27 +44793,15 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1088,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1120,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
-     "field_offset" : 1152,
+     "field_offset" : 1120,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1248,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45312,7 +44809,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48149,6 +47646,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
@@ -49948,12 +49484,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 576,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -49961,7 +49497,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -52977,10 +52513,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -52990,10 +52523,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53003,7 +52533,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv7-a-neon_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -53961,7 +53491,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -53969,7 +53499,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54458,60 +53988,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55310,7 +54786,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 24,
+   "size" : 88,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55548,325 +55024,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 13248,
+     "field_offset" : 46016,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 13280,
+     "field_offset" : 46048,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 13312,
+     "field_offset" : 46080,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 13376,
+     "field_offset" : 46144,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 13440,
+     "field_offset" : 46208,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 13504,
+     "field_offset" : 46272,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 13536,
+     "field_offset" : 46304,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 14048,
+     "field_offset" : 46816,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 14176,
+     "field_offset" : 46944,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 14208,
+     "field_offset" : 46976,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 14240,
+     "field_offset" : 47008,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 14272,
+     "field_offset" : 47040,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 14304,
+     "field_offset" : 47072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 14336,
+     "field_offset" : 47104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 14368,
+     "field_offset" : 47136,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 14400,
+     "field_offset" : 47168,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 14432,
+     "field_offset" : 47200,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 14440,
+     "field_offset" : 47208,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 14448,
+     "field_offset" : 47216,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 14464,
+     "field_offset" : 47232,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 14496,
+     "field_offset" : 47264,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 14624,
+     "field_offset" : 47392,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 14656,
+     "field_offset" : 47424,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 14688,
+     "field_offset" : 47456,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 14720,
+     "field_offset" : 47488,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 14752,
+     "field_offset" : 47520,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iSt9__va_listEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 14784,
+     "field_offset" : 47552,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 14816,
+     "field_offset" : 47584,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 14848,
+     "field_offset" : 47616,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 14880,
+     "field_offset" : 47648,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 14912,
+     "field_offset" : 47680,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 14944,
+     "field_offset" : 47712,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 14976,
+     "field_offset" : 47744,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 15168,
+     "field_offset" : 48448,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 15232,
+     "field_offset" : 48512,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 15264,
+     "field_offset" : 48544,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 15272,
+     "field_offset" : 48552,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 15280,
+     "field_offset" : 48560,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 15296,
+     "field_offset" : 48576,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 15328,
+     "field_offset" : 48608,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 15360,
+     "field_offset" : 48640,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 15424,
+     "field_offset" : 48704,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 15488,
+     "field_offset" : 48768,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 15552,
+     "field_offset" : 48832,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 15616,
+     "field_offset" : 48896,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 15680,
+     "field_offset" : 48960,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 15744,
+     "field_offset" : 49024,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 15752,
+     "field_offset" : 49032,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 15760,
+     "field_offset" : 49040,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 15776,
+     "field_offset" : 49056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 15808,
+     "field_offset" : 49088,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 15840,
+     "field_offset" : 49120,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 15936,
+     "field_offset" : 49216,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 15968,
+     "field_offset" : 49248,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55875,7 +55351,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 2000,
+   "size" : 6160,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56787,7 +56263,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56827,7 +56303,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56867,7 +56343,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56907,7 +56383,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
@@ -56947,7 +56423,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -56987,7 +56463,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57027,7 +56503,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57067,7 +56543,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57107,7 +56583,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57150,7 +56626,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57190,7 +56666,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58876,6 +58352,32 @@
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "size" : 84,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -59010,7 +58512,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump
index afb98d6..683d471 100644
--- a/30/64/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libnativewindow.so.lsdump
@@ -1194,6 +1194,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1249,27 +1270,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1760,7 +1760,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2658,15 +2658,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv7-a-neon_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2850,7 +2841,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump
index 8512c17..eab814e 100644
--- a/30/64/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libneuralnetworks.so.lsdump
@@ -2434,24 +2434,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2461,24 +2443,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2488,24 +2452,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2515,24 +2461,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2542,24 +2470,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2569,24 +2479,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2596,24 +2488,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2623,24 +2497,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2668,33 +2524,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2704,33 +2533,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2785,24 +2587,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2812,24 +2596,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2839,24 +2605,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2866,24 +2614,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2893,24 +2623,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2920,24 +2632,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2947,24 +2641,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2974,24 +2650,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3155,36 +2813,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 4,
@@ -3195,36 +2823,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv7-a-neon_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 4,
diff --git a/30/64/arm_armv7-a-neon/source-based/libvulkan.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libvulkan.so.lsdump
index eca0a9a..3754dfb 100644
--- a/30/64/arm_armv7-a-neon/source-based/libvulkan.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 128,
@@ -873,27 +801,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11603,7 +11519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11696,7 +11612,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11717,7 +11633,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11735,7 +11651,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11768,7 +11684,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11789,7 +11705,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11807,7 +11723,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11831,7 +11747,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11864,7 +11780,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11888,7 +11804,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11915,7 +11831,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11942,7 +11858,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11966,7 +11882,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11993,7 +11909,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12023,7 +11939,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12050,7 +11966,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12083,7 +11999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12104,7 +12020,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12134,7 +12050,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12152,7 +12068,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12176,7 +12092,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12203,7 +12119,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12227,7 +12143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12251,7 +12167,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12269,7 +12185,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12281,13 +12197,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12299,7 +12215,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12323,7 +12239,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12338,7 +12254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12377,7 +12293,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12404,7 +12320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12422,7 +12338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12443,7 +12359,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12473,7 +12389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12488,7 +12404,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12509,7 +12425,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12527,7 +12443,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12542,7 +12458,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12560,7 +12476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12575,7 +12491,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12596,7 +12512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12614,7 +12530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12632,7 +12548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12650,7 +12566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12671,7 +12587,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12695,7 +12611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12737,7 +12653,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12932,7 +12848,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13730,7 +13646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13742,7 +13658,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13763,7 +13679,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13889,7 +13805,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -14303,7 +14219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14321,7 +14237,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14339,7 +14255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14357,7 +14273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14372,7 +14288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14387,7 +14303,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14405,7 +14321,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14423,7 +14339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14453,7 +14369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14471,7 +14387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14486,7 +14402,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14501,7 +14417,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14522,7 +14438,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14537,7 +14453,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14552,7 +14468,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14570,7 +14486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14588,7 +14504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14621,7 +14537,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14642,7 +14558,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14660,7 +14576,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14681,7 +14597,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14702,7 +14618,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14951,7 +14867,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15720,15 +15636,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -16854,78 +16761,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -16935,78 +16770,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17079,15 +16842,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP12VkInstance_T",
    "name" : "VkInstance_T **",
    "referenced_type" : "_ZTIP12VkInstance_T",
@@ -17097,18 +16851,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -17117,7 +16862,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17126,7 +16871,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17142,15 +16887,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -18551,86 +18287,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 4,
@@ -18641,86 +18297,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv7-a-neon_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 4,
diff --git a/30/64/arm_armv7-a-neon/source-based/libz.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libz.so.lsdump
index 03ff860..481057e 100644
--- a/30/64/arm_armv7-a-neon/source-based/libz.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libz.so.lsdump
@@ -2240,42 +2240,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/crc32.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/deflate.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv7-a-neon_static/obj/external/zlib/trees.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
diff --git a/30/64/arm_armv8-a/source-based/libEGL.so.lsdump b/30/64/arm_armv8-a/source-based/libEGL.so.lsdump
index 2282700..6745ccf 100644
--- a/30/64/arm_armv8-a/source-based/libEGL.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libEGL.so.lsdump
@@ -2021,15 +2021,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump b/30/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
index fb7e225..506f8c3 100644
--- a/30/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
@@ -5892,10 +5892,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26106,24 +26106,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26322,15 +26304,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26340,15 +26313,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv8-a_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26358,15 +26322,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv8-a_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26439,15 +26394,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26457,15 +26403,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26475,15 +26412,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26493,15 +26421,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26511,15 +26430,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26529,15 +26439,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv8-a_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36513,6 +36414,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38056,14 +37966,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38080,14 +37982,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38104,14 +37998,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38120,14 +38006,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38144,14 +38022,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38160,14 +38030,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38176,14 +38038,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38200,14 +38054,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38216,14 +38062,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38240,14 +38078,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39547,7 +39377,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39607,7 +39437,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41391,16 +41221,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43234,11 +43054,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52883,8 +52698,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52893,7 +52714,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54701,74 +54522,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4032,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4480,
+     "field_offset" : 5376,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5472,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54777,7 +54622,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55159,6 +55004,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57742,6 +57641,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57781,6 +57684,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67683,6 +67590,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67722,6 +67633,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68773,6 +68688,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68812,6 +68731,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76689,7 +76612,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump b/30/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
index 3a19d4a..8a0fd9a 100644
--- a/30/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
@@ -5928,10 +5928,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26214,24 +26214,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26430,15 +26412,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26448,15 +26421,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv8-a_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26466,15 +26430,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv8-a_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26547,15 +26502,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26565,15 +26511,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26583,15 +26520,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26601,15 +26529,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26619,15 +26538,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26637,15 +26547,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_arm_armv8-a_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36621,6 +36522,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38164,14 +38074,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38188,14 +38090,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38212,14 +38106,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38228,14 +38114,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38252,14 +38130,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38268,14 +38138,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38284,14 +38146,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38308,14 +38162,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38324,14 +38170,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38348,14 +38186,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39655,7 +39485,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39715,7 +39545,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41499,16 +41329,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_arm_armv8-a_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43342,11 +43162,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52991,8 +52806,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53001,7 +52822,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54809,74 +54630,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4032,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4480,
+     "field_offset" : 5376,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5472,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54885,7 +54730,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 576,
+   "size" : 696,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55267,6 +55112,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57850,6 +57749,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57889,6 +57792,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67791,6 +67698,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67830,6 +67741,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68881,6 +68796,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68920,6 +68839,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76797,7 +76720,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv8-a/source-based/libaaudio.so.lsdump b/30/64/arm_armv8-a/source-based/libaaudio.so.lsdump
index 549fa2d..b316005 100644
--- a/30/64/arm_armv8-a/source-based/libaaudio.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libaaudio.so.lsdump
@@ -443,7 +443,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -537,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -616,7 +616,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/64/arm_armv8-a/source-based/libandroid.so.lsdump b/30/64/arm_armv8-a/source-based/libandroid.so.lsdump
index 4d6e74f..aa487be 100644
--- a/30/64/arm_armv8-a/source-based/libandroid.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libandroid.so.lsdump
@@ -1891,6 +1891,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1946,27 +1967,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2277,7 +2277,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2743,51 +2743,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv8-a_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv8-a_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv8-a_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_arm_armv8-a_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2971,7 +2926,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump b/30/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
index 0a308a3..0a485ef 100644
--- a/30/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -3144,7 +3144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3744,7 +3744,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6263,7 +6263,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6377,7 +6377,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6389,7 +6389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6461,7 +6461,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6515,7 +6515,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6533,7 +6533,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6542,7 +6542,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6554,7 +6554,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6566,7 +6566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6581,7 +6581,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6602,7 +6602,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6617,7 +6617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6635,7 +6635,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6650,7 +6650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6668,7 +6668,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6683,7 +6683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6701,7 +6701,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6716,7 +6716,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6734,7 +6734,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6749,7 +6749,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6767,7 +6767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPx"
@@ -6782,7 +6782,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6800,7 +6800,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6815,7 +6815,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6836,7 +6836,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6851,7 +6851,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6869,7 +6869,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6890,10 +6890,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6905,7 +6905,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6920,7 +6920,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6938,7 +6938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPy"
@@ -6953,7 +6953,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6971,7 +6971,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6986,7 +6986,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7001,7 +7001,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7022,7 +7022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7037,7 +7037,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7055,7 +7055,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7070,7 +7070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7088,7 +7088,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7103,7 +7103,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7121,7 +7121,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7136,7 +7136,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7154,7 +7154,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7169,7 +7169,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7187,7 +7187,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIx"
@@ -7202,7 +7202,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKx"
@@ -7220,7 +7220,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7235,7 +7235,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7256,7 +7256,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7271,7 +7271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7289,7 +7289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7310,10 +7310,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7325,7 +7325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7340,7 +7340,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7358,7 +7358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -7373,7 +7373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKy"
@@ -7391,7 +7391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7409,7 +7409,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7421,7 +7421,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7430,7 +7430,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7457,7 +7457,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7472,7 +7472,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7484,7 +7484,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7499,7 +7499,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7511,7 +7511,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7520,7 +7520,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7532,7 +7532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7544,7 +7544,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7556,7 +7556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7568,7 +7568,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7580,7 +7580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7589,7 +7589,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9975,15 +9975,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10029,24 +10020,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10056,24 +10029,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10083,15 +10038,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10218,15 +10164,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10236,15 +10173,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10272,24 +10200,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/64/arm_armv8-a/source-based/libc.so.lsdump b/30/64/arm_armv8-a/source-based/libc.so.lsdump
index 01b9bf2..8ab77c8 100644
--- a/30/64/arm_armv8-a/source-based/libc.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libc.so.lsdump
@@ -7,7 +7,7 @@
    "name" : "char [0]",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA0_c",
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_info.h"
   },
   {
    "alignment" : 1,
@@ -214,7 +214,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/mbstate_t.h"
+   "source_file" : "/bionic/libc/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -262,15 +262,6 @@
    "source_file" : "/bionic/libc/include/signal.h"
   },
   {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIA84_c",
-   "name" : "char [84]",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIA84_c",
-   "size" : 84,
-   "source_file" : "/bionic/libc/include/bits/struct_file.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA8_6fp_reg",
    "name" : "fp_reg [8]",
@@ -325,13 +316,6 @@
    "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_info.h"
   },
   {
-   "linker_set_key" : "_ZTIA_7__sFILE",
-   "name" : "__sFILE []",
-   "referenced_type" : "_ZTI7__sFILE",
-   "self_type" : "_ZTIA_7__sFILE",
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
    "linker_set_key" : "_ZTIA_Pc",
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
@@ -355,7 +339,7 @@
    "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
-   "name" : "bool",
+   "name" : "_Bool",
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIb",
    "size" : 1
@@ -6801,7 +6785,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPKvS0_E",
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -7076,7 +7060,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7100,7 +7084,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7124,7 +7108,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_arm_armv8-a_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -8546,7 +8530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -8561,7 +8545,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8579,7 +8563,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPj",
@@ -8615,7 +8599,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8630,7 +8614,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8645,7 +8629,7 @@
      "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8696,7 +8680,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -8765,7 +8749,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9689,7 +9673,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -10010,7 +9994,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -10025,7 +10009,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11876,7 +11860,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -12251,7 +12235,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_arm_armv8-a_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -12527,7 +12511,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12542,7 +12526,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_arm_armv8-a_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13458,12 +13442,6 @@
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
-   "linker_set_key" : "__sF",
-   "name" : "__sF",
-   "referenced_type" : "_ZTIA_7__sFILE",
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
    "linker_set_key" : "_ctype_",
    "name" : "_ctype_",
    "referenced_type" : "_ZTIPKc",
@@ -13974,7 +13952,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14127,7 +14105,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "self_type" : "_ZTIPFiPKvS0_E",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -14212,375 +14190,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/arch-arm/bionic/exidx_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/arch-arm/bionic/exidx_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_arm_armv8-a_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv8-a_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv8-a_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv8-a_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv8-a_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv8-a_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_arm_armv8-a_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm_armv8-a_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_arm_armv8-a_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_arm_armv8-a_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm_armv8-a_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_arm_armv8-a_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv8-a_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv8-a_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK10sigset64_t",
    "name" : "const sigset64_t *",
    "referenced_type" : "_ZTIK10sigset64_t",
@@ -14671,24 +14280,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -14698,24 +14289,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_arm_armv8-a_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -14739,7 +14312,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14752,15 +14325,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm_armv8-a_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_arm_armv8-a_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14847,7 +14411,7 @@
    "referenced_type" : "_ZTIKPc",
    "self_type" : "_ZTIPKPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/getopt.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14865,7 +14429,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -14892,7 +14456,7 @@
    "referenced_type" : "_ZTIKj",
    "self_type" : "_ZTIPKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -15018,7 +14582,7 @@
    "referenced_type" : "_ZTIPj",
    "self_type" : "_ZTIPPj",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/wchar.h"
+   "source_file" : "/bionic/libc/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -15045,7 +14609,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/context_node.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/contexts_pre_split.h"
   },
   {
    "alignment" : 4,
@@ -15054,7 +14618,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/bits/getopt.h"
   },
   {
    "alignment" : 4,
@@ -15072,7 +14636,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -15081,7 +14645,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -15090,7 +14654,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIPl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -15127,106 +14691,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_arm_armv8-a_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_arm_armv8-a_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv8-a_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/libunwind_llvm/libunwind_llvm/android_arm_armv8-a_static/obj/external/libunwind_llvm/src/libunwind.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm_armv8-a_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_arm_armv8-a_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
@@ -15400,7 +14864,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -15568,7 +15032,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -15598,7 +15062,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -16056,7 +15520,7 @@
    [
     {
      "field_name" : "fpregs",
-     "referenced_type" : "_ZTIA8_N11user_fpregs6fp_regE"
+     "referenced_type" : "_ZTIA8_6fp_reg"
     },
     {
      "field_name" : "fpsr",
@@ -18309,22 +17773,6 @@
    "fields" :
    [
     {
-     "field_name" : "__private",
-     "referenced_type" : "_ZTIA84_c"
-    }
-   ],
-   "linker_set_key" : "_ZTI7__sFILE",
-   "name" : "__sFILE",
-   "referenced_type" : "_ZTI7__sFILE",
-   "self_type" : "_ZTI7__sFILE",
-   "size" : 84,
-   "source_file" : "/bionic/libc/include/bits/struct_file.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "cmsg_len",
      "referenced_type" : "_ZTIj"
     },
diff --git a/30/64/arm_armv8-a/source-based/libcamera2ndk.so.lsdump b/30/64/arm_armv8-a/source-based/libcamera2ndk.so.lsdump
index 336df13..6ef40a1 100644
--- a/30/64/arm_armv8-a/source-based/libcamera2ndk.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libcamera2ndk.so.lsdump
@@ -2594,6 +2594,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3128,27 +3149,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4888,7 +4888,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4900,7 +4900,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4909,7 +4909,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4924,7 +4924,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4936,10 +4936,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4951,7 +4951,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4960,7 +4960,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4975,7 +4975,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4984,7 +4984,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4999,7 +4999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5008,7 +5008,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5023,7 +5023,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5035,10 +5035,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5050,7 +5050,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5101,7 +5101,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5122,13 +5122,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5317,10 +5317,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5329,7 +5329,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5347,7 +5347,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5356,7 +5356,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5374,7 +5374,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5392,7 +5392,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -5410,7 +5410,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5437,7 +5437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5452,10 +5452,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5464,7 +5464,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5476,7 +5476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5494,7 +5494,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5512,7 +5512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5533,7 +5533,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5548,7 +5548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5563,7 +5563,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5584,7 +5584,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5605,7 +5605,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5626,7 +5626,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5647,7 +5647,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5671,7 +5671,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5695,7 +5695,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5719,7 +5719,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5743,7 +5743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5767,7 +5767,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5791,7 +5791,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5812,7 +5812,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5833,7 +5833,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5902,7 +5902,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5929,7 +5929,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5950,7 +5950,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5962,7 +5962,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5980,7 +5980,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6389,15 +6389,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6425,60 +6416,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6488,69 +6425,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6560,69 +6434,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6632,15 +6443,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6659,15 +6461,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6686,15 +6479,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6812,24 +6596,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6848,27 +6614,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6884,15 +6632,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6904,7 +6643,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6920,15 +6659,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6938,15 +6668,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6956,60 +6677,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_arm_armv8-a_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/64/arm_armv8-a/source-based/libjnigraphics.so.lsdump b/30/64/arm_armv8-a/source-based/libjnigraphics.so.lsdump
index 94ea5d3..c0123c0 100644
--- a/30/64/arm_armv8-a/source-based/libjnigraphics.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libjnigraphics.so.lsdump
@@ -9396,7 +9396,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -10043,15 +10043,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 4,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -11048,7 +11039,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_arm_armv8-a_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 4,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19835,11 +19826,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -26342,7 +26328,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv8-a/source-based/libm.so.lsdump b/30/64/arm_armv8-a/source-based/libm.so.lsdump
index 1f09b33..88b8414 100644
--- a/30/64/arm_armv8-a/source-based/libm.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libm.so.lsdump
@@ -242,7 +242,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA5_f",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 8,
@@ -4416,7 +4416,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIPd",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4524,7 +4524,7 @@
    "referenced_type" : "_ZTIA2_d",
    "self_type" : "_ZTIA2_Kd",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_rint.c"
   },
   {
    "alignment" : 4,
@@ -4534,7 +4534,7 @@
    "referenced_type" : "_ZTIA2_f",
    "self_type" : "_ZTIA2_Kf",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_rintf.c"
   },
   {
    "alignment" : 8,
@@ -4584,7 +4584,7 @@
    "referenced_type" : "_ZTIA5_f",
    "self_type" : "_ZTIA5_Kf",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4762,7 +4762,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cexp.c"
   },
   {
    "alignment" : 8,
diff --git a/30/64/arm_armv8-a/source-based/libmediandk.so.lsdump b/30/64/arm_armv8-a/source-based/libmediandk.so.lsdump
index 5f80d69..c1229a0 100644
--- a/30/64/arm_armv8-a/source-based/libmediandk.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libmediandk.so.lsdump
@@ -347,11 +347,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 1536,
+   "size" : 5632,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7028,6 +7037,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7131,27 +7161,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7754,7 +7763,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7809,7 +7818,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19015,7 +19024,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19030,7 +19039,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19048,7 +19057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19063,7 +19072,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19081,7 +19090,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19153,7 +19162,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19219,7 +19228,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19234,7 +19243,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20050,7 +20059,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20083,7 +20092,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20776,7 +20785,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20800,7 +20809,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20824,7 +20833,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20890,7 +20899,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20974,7 +20983,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21022,7 +21031,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21034,10 +21043,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21049,7 +21058,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21061,7 +21070,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21082,7 +21091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21100,7 +21109,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21118,7 +21127,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21136,7 +21145,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21154,7 +21163,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21181,7 +21190,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21199,7 +21208,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21214,7 +21223,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21223,7 +21232,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21244,7 +21253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21262,7 +21271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21280,7 +21289,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21298,7 +21307,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21316,7 +21325,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21343,7 +21352,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21361,7 +21370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21379,7 +21388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21394,7 +21403,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIi",
@@ -22386,96 +22395,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22521,42 +22440,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22886,7 +22769,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -23103,41 +22986,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23220,51 +23068,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23274,15 +23077,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23472,6 +23266,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23915,7 +23718,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27282,24 +27085,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27525,42 +27310,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28394,7 +28143,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -28497,15 +28246,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28542,24 +28282,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31199,7 +30921,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31253,7 +30975,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31287,42 +31009,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32112,7 +31798,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 168,
+   "size" : 232,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32280,7 +31966,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32370,7 +32056,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33021,7 +32707,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33130,7 +32816,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33156,16 +32842,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34136,7 +33812,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34146,46 +33822,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 4,
@@ -34246,96 +33882,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -35076,11 +34622,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39769,38 +39310,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -39973,22 +39482,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
+     "field_offset" : 1760,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
+     "field_offset" : 1768,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1264,
+     "field_offset" : 1776,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1280,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -39997,7 +39506,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 168,
+   "size" : 232,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45284,27 +44793,15 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1088,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1120,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
-     "field_offset" : 1152,
+     "field_offset" : 1120,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1248,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45312,7 +44809,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48149,6 +47646,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
@@ -49948,12 +49484,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 576,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -49961,7 +49497,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -52977,10 +52513,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -52990,10 +52523,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53003,7 +52533,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_arm_armv8-a_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -53961,7 +53491,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -53969,7 +53499,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54458,60 +53988,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55310,7 +54786,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 24,
+   "size" : 88,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55548,325 +55024,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 13248,
+     "field_offset" : 46016,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 13280,
+     "field_offset" : 46048,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 13312,
+     "field_offset" : 46080,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 13376,
+     "field_offset" : 46144,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 13440,
+     "field_offset" : 46208,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 13504,
+     "field_offset" : 46272,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 13536,
+     "field_offset" : 46304,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 14048,
+     "field_offset" : 46816,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 14176,
+     "field_offset" : 46944,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 14208,
+     "field_offset" : 46976,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 14240,
+     "field_offset" : 47008,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 14272,
+     "field_offset" : 47040,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 14304,
+     "field_offset" : 47072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 14336,
+     "field_offset" : 47104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 14368,
+     "field_offset" : 47136,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 14400,
+     "field_offset" : 47168,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 14432,
+     "field_offset" : 47200,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 14440,
+     "field_offset" : 47208,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 14448,
+     "field_offset" : 47216,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 14464,
+     "field_offset" : 47232,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 14496,
+     "field_offset" : 47264,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 14624,
+     "field_offset" : 47392,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 14656,
+     "field_offset" : 47424,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 14688,
+     "field_offset" : 47456,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 14720,
+     "field_offset" : 47488,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 14752,
+     "field_offset" : 47520,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iSt9__va_listEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 14784,
+     "field_offset" : 47552,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 14816,
+     "field_offset" : 47584,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 14848,
+     "field_offset" : 47616,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 14880,
+     "field_offset" : 47648,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 14912,
+     "field_offset" : 47680,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 14944,
+     "field_offset" : 47712,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 14976,
+     "field_offset" : 47744,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 15168,
+     "field_offset" : 48448,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 15232,
+     "field_offset" : 48512,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 15264,
+     "field_offset" : 48544,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 15272,
+     "field_offset" : 48552,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 15280,
+     "field_offset" : 48560,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 15296,
+     "field_offset" : 48576,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 15328,
+     "field_offset" : 48608,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 15360,
+     "field_offset" : 48640,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 15424,
+     "field_offset" : 48704,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 15488,
+     "field_offset" : 48768,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 15552,
+     "field_offset" : 48832,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 15616,
+     "field_offset" : 48896,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 15680,
+     "field_offset" : 48960,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 15744,
+     "field_offset" : 49024,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 15752,
+     "field_offset" : 49032,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 15760,
+     "field_offset" : 49040,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 15776,
+     "field_offset" : 49056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 15808,
+     "field_offset" : 49088,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 15840,
+     "field_offset" : 49120,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 15936,
+     "field_offset" : 49216,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 15968,
+     "field_offset" : 49248,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55875,7 +55351,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 2000,
+   "size" : 6160,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56787,7 +56263,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56827,7 +56303,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56867,7 +56343,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56907,7 +56383,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
@@ -56947,7 +56423,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -56987,7 +56463,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57027,7 +56503,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57067,7 +56543,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57107,7 +56583,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57150,7 +56626,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57190,7 +56666,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58876,6 +58352,32 @@
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "size" : 84,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -59010,7 +58512,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv8-a/source-based/libnativewindow.so.lsdump b/30/64/arm_armv8-a/source-based/libnativewindow.so.lsdump
index a62e9fe..683d471 100644
--- a/30/64/arm_armv8-a/source-based/libnativewindow.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libnativewindow.so.lsdump
@@ -1194,6 +1194,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1249,27 +1270,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1760,7 +1760,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2658,15 +2658,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_arm_armv8-a_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2850,7 +2841,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 160,
+   "size" : 152,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/arm_armv8-a/source-based/libneuralnetworks.so.lsdump b/30/64/arm_armv8-a/source-based/libneuralnetworks.so.lsdump
index 31b97ec..eab814e 100644
--- a/30/64/arm_armv8-a/source-based/libneuralnetworks.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libneuralnetworks.so.lsdump
@@ -2434,24 +2434,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2461,24 +2443,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2488,24 +2452,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2515,24 +2461,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2542,24 +2470,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2569,24 +2479,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2596,24 +2488,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2623,24 +2497,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2668,33 +2524,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2704,33 +2533,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2785,24 +2587,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2812,24 +2596,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2839,24 +2605,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2866,24 +2614,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2893,24 +2623,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2920,24 +2632,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2947,24 +2641,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2974,24 +2650,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3155,36 +2813,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 4,
@@ -3195,36 +2823,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_arm_armv8-a_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 4,
diff --git a/30/64/arm_armv8-a/source-based/libvulkan.so.lsdump b/30/64/arm_armv8-a/source-based/libvulkan.so.lsdump
index 31a7603..3754dfb 100644
--- a/30/64/arm_armv8-a/source-based/libvulkan.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 128,
@@ -873,27 +801,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11603,7 +11519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11696,7 +11612,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11717,7 +11633,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11735,7 +11651,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11768,7 +11684,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11789,7 +11705,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11807,7 +11723,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11831,7 +11747,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11864,7 +11780,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11888,7 +11804,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11915,7 +11831,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11942,7 +11858,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11966,7 +11882,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11993,7 +11909,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12023,7 +11939,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12050,7 +11966,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12083,7 +11999,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12104,7 +12020,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12134,7 +12050,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12152,7 +12068,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12176,7 +12092,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12203,7 +12119,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12227,7 +12143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12251,7 +12167,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12269,7 +12185,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12281,13 +12197,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12299,7 +12215,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12323,7 +12239,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12338,7 +12254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12377,7 +12293,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12404,7 +12320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12422,7 +12338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12443,7 +12359,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12473,7 +12389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12488,7 +12404,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12509,7 +12425,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12527,7 +12443,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12542,7 +12458,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12560,7 +12476,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12575,7 +12491,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12596,7 +12512,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12614,7 +12530,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12632,7 +12548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12650,7 +12566,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12671,7 +12587,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12695,7 +12611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12737,7 +12653,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12932,7 +12848,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13730,7 +13646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13742,7 +13658,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13763,7 +13679,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13889,7 +13805,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -14303,7 +14219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14321,7 +14237,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14339,7 +14255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14357,7 +14273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14372,7 +14288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14387,7 +14303,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14405,7 +14321,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14423,7 +14339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14453,7 +14369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14471,7 +14387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14486,7 +14402,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14501,7 +14417,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14522,7 +14438,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14537,7 +14453,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14552,7 +14468,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14570,7 +14486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14588,7 +14504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14621,7 +14537,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14642,7 +14558,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14660,7 +14576,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14681,7 +14597,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14702,7 +14618,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14951,7 +14867,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15720,15 +15636,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -16854,78 +16761,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -16935,78 +16770,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17079,15 +16842,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP12VkInstance_T",
    "name" : "VkInstance_T **",
    "referenced_type" : "_ZTIP12VkInstance_T",
@@ -17097,18 +16851,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -17117,7 +16862,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17126,7 +16871,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17142,15 +16887,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -18551,86 +18287,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 4,
@@ -18641,86 +18297,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_arm_armv8-a_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 4,
diff --git a/30/64/arm_armv8-a/source-based/libz.so.lsdump b/30/64/arm_armv8-a/source-based/libz.so.lsdump
index b64061f..481057e 100644
--- a/30/64/arm_armv8-a/source-based/libz.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libz.so.lsdump
@@ -2240,42 +2240,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv8-a_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv8-a_static/obj/external/zlib/crc32.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv8-a_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv8-a_static/obj/external/zlib/deflate.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv8-a_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_arm_armv8-a_static/obj/external/zlib/trees.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
diff --git a/30/64/x86/source-based/libEGL.so.lsdump b/30/64/x86/source-based/libEGL.so.lsdump
index c784ee9..65f60d5 100644
--- a/30/64/x86/source-based/libEGL.so.lsdump
+++ b/30/64/x86/source-based/libEGL.so.lsdump
@@ -2020,15 +2020,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/64/x86/source-based/libOpenMAXAL.so.lsdump b/30/64/x86/source-based/libOpenMAXAL.so.lsdump
index c31eb6b..04f7118 100644
--- a/30/64/x86/source-based/libOpenMAXAL.so.lsdump
+++ b/30/64/x86/source-based/libOpenMAXAL.so.lsdump
@@ -5891,10 +5891,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26105,24 +26105,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26321,15 +26303,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26339,15 +26312,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26357,15 +26321,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26438,15 +26393,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26456,15 +26402,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26474,15 +26411,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26492,15 +26420,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26510,15 +26429,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26528,15 +26438,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36512,6 +36413,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38055,14 +37965,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38079,14 +37981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38103,14 +37997,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38119,14 +38005,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38143,14 +38021,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38159,14 +38029,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38175,14 +38037,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38199,14 +38053,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38215,14 +38061,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38239,14 +38077,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39546,7 +39376,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39600,13 +39430,13 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android11AudioRecordE",
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41390,16 +41220,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43233,11 +43053,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52882,8 +52697,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52892,7 +52713,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54431,7 +54252,7 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -54700,74 +54521,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4000,
+     "field_offset" : 4896,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4384,
+     "field_offset" : 5280,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5376,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54776,7 +54621,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55158,6 +55003,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57741,6 +57640,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57780,6 +57683,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67682,6 +67589,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67721,6 +67632,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68772,6 +68687,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68811,6 +68730,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76688,7 +76611,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86/source-based/libOpenSLES.so.lsdump b/30/64/x86/source-based/libOpenSLES.so.lsdump
index a43ac3b..2bf3b04 100644
--- a/30/64/x86/source-based/libOpenSLES.so.lsdump
+++ b/30/64/x86/source-based/libOpenSLES.so.lsdump
@@ -5927,10 +5927,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26213,24 +26213,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26429,15 +26411,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26447,15 +26420,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26465,15 +26429,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26546,15 +26501,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26564,15 +26510,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26582,15 +26519,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26600,15 +26528,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26618,15 +26537,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26636,15 +26546,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36620,6 +36521,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38163,14 +38073,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38187,14 +38089,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38211,14 +38105,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38227,14 +38113,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38251,14 +38129,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38267,14 +38137,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38283,14 +38145,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38307,14 +38161,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38323,14 +38169,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38347,14 +38185,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39654,7 +39484,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39708,13 +39538,13 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android11AudioRecordE",
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41498,16 +41328,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43341,11 +43161,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52990,8 +52805,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53000,7 +52821,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54539,7 +54360,7 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -54808,74 +54629,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4000,
+     "field_offset" : 4896,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4384,
+     "field_offset" : 5280,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5376,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54884,7 +54729,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55266,6 +55111,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57849,6 +57748,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57888,6 +57791,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67790,6 +67697,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67829,6 +67740,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68880,6 +68795,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68919,6 +68838,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76796,7 +76719,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86/source-based/libaaudio.so.lsdump b/30/64/x86/source-based/libaaudio.so.lsdump
index 812a083..e724293 100644
--- a/30/64/x86/source-based/libaaudio.so.lsdump
+++ b/30/64/x86/source-based/libaaudio.so.lsdump
@@ -442,7 +442,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -536,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -615,7 +615,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/64/x86/source-based/libandroid.so.lsdump b/30/64/x86/source-based/libandroid.so.lsdump
index 93b6fe1..9df9e28 100644
--- a/30/64/x86/source-based/libandroid.so.lsdump
+++ b/30/64/x86/source-based/libandroid.so.lsdump
@@ -1900,6 +1900,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1955,27 +1976,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2286,7 +2286,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2752,51 +2752,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2989,7 +2944,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/x86/source-based/libbinder_ndk.so.lsdump b/30/64/x86/source-based/libbinder_ndk.so.lsdump
index 67471fe..998e22e 100644
--- a/30/64/x86/source-based/libbinder_ndk.so.lsdump
+++ b/30/64/x86/source-based/libbinder_ndk.so.lsdump
@@ -3143,7 +3143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3743,7 +3743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6262,7 +6262,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6376,7 +6376,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6388,7 +6388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6460,7 +6460,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6514,7 +6514,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6532,7 +6532,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6541,7 +6541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6553,7 +6553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6565,7 +6565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6580,7 +6580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6601,7 +6601,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6616,7 +6616,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6634,7 +6634,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6649,7 +6649,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6667,7 +6667,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6682,7 +6682,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6700,7 +6700,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6715,7 +6715,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6733,7 +6733,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6748,7 +6748,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6766,7 +6766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPx"
@@ -6781,7 +6781,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6799,7 +6799,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6814,7 +6814,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6835,7 +6835,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6850,7 +6850,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6868,7 +6868,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6889,10 +6889,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6904,7 +6904,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6919,7 +6919,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6937,7 +6937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPy"
@@ -6952,7 +6952,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6970,7 +6970,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6985,7 +6985,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7000,7 +7000,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7021,7 +7021,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7036,7 +7036,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7054,7 +7054,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7069,7 +7069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7087,7 +7087,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7102,7 +7102,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7120,7 +7120,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7135,7 +7135,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7153,7 +7153,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7168,7 +7168,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7186,7 +7186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIx"
@@ -7201,7 +7201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKx"
@@ -7219,7 +7219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7234,7 +7234,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7255,7 +7255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7270,7 +7270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7288,7 +7288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7309,10 +7309,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7324,7 +7324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7339,7 +7339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7357,7 +7357,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -7372,7 +7372,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKy"
@@ -7390,7 +7390,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7408,7 +7408,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7420,7 +7420,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7429,7 +7429,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7456,7 +7456,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7471,7 +7471,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7483,7 +7483,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7498,7 +7498,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7510,7 +7510,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7519,7 +7519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7531,7 +7531,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7543,7 +7543,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7555,7 +7555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7567,7 +7567,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7579,7 +7579,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7588,7 +7588,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9974,15 +9974,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10028,24 +10019,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10055,24 +10028,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10082,15 +10037,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10217,15 +10163,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10235,15 +10172,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10271,24 +10199,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/64/x86/source-based/libc.so.lsdump b/30/64/x86/source-based/libc.so.lsdump
index 97f3b59..54635f4 100644
--- a/30/64/x86/source-based/libc.so.lsdump
+++ b/30/64/x86/source-based/libc.so.lsdump
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/bits/fenv_x86.h"
+   "source_file" : "/bionic/libc/include/utmp.h"
   },
   {
    "alignment" : 4,
@@ -6390,7 +6390,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPKvS0_E",
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -6665,7 +6665,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -6689,7 +6689,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -6713,7 +6713,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7280,7 +7280,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPK10sigset64_t"
@@ -7304,7 +7304,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -8123,7 +8123,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -8138,7 +8138,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8156,7 +8156,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPi",
@@ -8192,7 +8192,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8207,7 +8207,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8222,7 +8222,7 @@
      "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8273,7 +8273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -8342,7 +8342,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9266,7 +9266,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9551,7 +9551,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -9566,7 +9566,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11417,7 +11417,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -11654,7 +11654,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_x86_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -11915,7 +11915,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11930,7 +11930,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13251,7 +13251,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -13395,7 +13395,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "self_type" : "_ZTIPFiPKvS0_E",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -13480,366 +13480,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/arch-x86/bionic/__libc_init_sysinfo.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/arch-x86/bionic/__libc_init_sysinfo.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK10sigset64_t",
    "name" : "const sigset64_t *",
    "referenced_type" : "_ZTIK10sigset64_t",
@@ -13930,24 +13570,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -13957,24 +13579,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -13998,7 +13602,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14007,28 +13611,10 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIPK8timespec",
    "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_static/obj/bionic/libc/bionic/fortify.sdump",
-   "size" : 4,
    "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14133,7 +13719,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
@@ -14322,7 +13908,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/bits/getopt.h"
   },
   {
    "alignment" : 4,
@@ -14358,7 +13944,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIPl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -14376,7 +13962,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
  "qualified_types" :
@@ -14395,96 +13981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
@@ -14668,7 +14164,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14678,7 +14174,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
   },
   {
    "alignment" : 4,
@@ -14836,7 +14332,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 1,
@@ -14856,7 +14352,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/wchar.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/x86/source-based/libcamera2ndk.so.lsdump b/30/64/x86/source-based/libcamera2ndk.so.lsdump
index 4438805..07b8810 100644
--- a/30/64/x86/source-based/libcamera2ndk.so.lsdump
+++ b/30/64/x86/source-based/libcamera2ndk.so.lsdump
@@ -2593,6 +2593,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3127,27 +3148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4887,7 +4887,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4899,7 +4899,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4908,7 +4908,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4923,7 +4923,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4935,10 +4935,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4950,7 +4950,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4959,7 +4959,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4974,7 +4974,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4983,7 +4983,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4998,7 +4998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5007,7 +5007,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5022,7 +5022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5034,10 +5034,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5049,7 +5049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5100,7 +5100,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5121,13 +5121,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5316,10 +5316,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5328,7 +5328,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5346,7 +5346,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5355,7 +5355,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5373,7 +5373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5391,7 +5391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -5409,7 +5409,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5436,7 +5436,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5451,10 +5451,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5463,7 +5463,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5475,7 +5475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5493,7 +5493,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5511,7 +5511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5532,7 +5532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5547,7 +5547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5562,7 +5562,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5583,7 +5583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5604,7 +5604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5625,7 +5625,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5646,7 +5646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5670,7 +5670,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5694,7 +5694,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5718,7 +5718,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5742,7 +5742,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5766,7 +5766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5790,7 +5790,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5811,7 +5811,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5832,7 +5832,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5901,7 +5901,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5928,7 +5928,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5949,7 +5949,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5961,7 +5961,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5979,7 +5979,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6388,15 +6388,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6424,60 +6415,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6487,69 +6424,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6559,69 +6433,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6631,15 +6442,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6658,15 +6460,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6685,15 +6478,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6811,24 +6595,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6847,27 +6613,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6883,15 +6631,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6903,7 +6642,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6919,15 +6658,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6937,15 +6667,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6955,60 +6676,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/64/x86/source-based/libjnigraphics.so.lsdump b/30/64/x86/source-based/libjnigraphics.so.lsdump
index feaf87b..cd21c79 100644
--- a/30/64/x86/source-based/libjnigraphics.so.lsdump
+++ b/30/64/x86/source-based/libjnigraphics.so.lsdump
@@ -8870,7 +8870,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -9517,15 +9517,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 4,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -10522,7 +10513,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 4,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19059,11 +19050,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -25578,7 +25564,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86/source-based/libm.so.lsdump b/30/64/x86/source-based/libm.so.lsdump
index add3925..6ad0130 100644
--- a/30/64/x86/source-based/libm.so.lsdump
+++ b/30/64/x86/source-based/libm.so.lsdump
@@ -152,7 +152,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA2_d",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquo.c"
   },
   {
    "alignment" : 4,
@@ -170,7 +170,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA2_f",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquof.c"
   },
   {
    "alignment" : 4,
@@ -251,7 +251,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA5_f",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -278,7 +278,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA6_d",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4125,7 +4125,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIPd",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4134,7 +4134,7 @@
    "referenced_type" : "_ZTIe",
    "self_type" : "_ZTIPe",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-netbsd/lib/libm/complex/cephes_subrl.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4232,7 +4232,7 @@
    "referenced_type" : "_ZTIA2_d",
    "self_type" : "_ZTIA2_Kd",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquo.c"
   },
   {
    "alignment" : 4,
@@ -4242,7 +4242,7 @@
    "referenced_type" : "_ZTIA2_f",
    "self_type" : "_ZTIA2_Kf",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquof.c"
   },
   {
    "alignment" : 4,
@@ -4282,7 +4282,7 @@
    "referenced_type" : "_ZTIA5_f",
    "self_type" : "_ZTIA5_Kf",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4302,7 +4302,7 @@
    "referenced_type" : "_ZTIA6_d",
    "self_type" : "_ZTIA6_Kd",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4440,7 +4440,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_lround.c"
   },
   {
    "alignment" : 4,
@@ -4460,7 +4460,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_lround.c"
   },
   {
    "alignment" : 4,
@@ -4470,7 +4470,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cbrtf.c"
   },
   {
    "alignment" : 2,
@@ -4512,7 +4512,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_log1pf.c"
   }
  ],
  "record_types" :
@@ -5450,7 +5450,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -5472,7 +5472,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/64/x86/source-based/libmediandk.so.lsdump b/30/64/x86/source-based/libmediandk.so.lsdump
index f3dc0fe..9b9f369 100644
--- a/30/64/x86/source-based/libmediandk.so.lsdump
+++ b/30/64/x86/source-based/libmediandk.so.lsdump
@@ -347,11 +347,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 1536,
+   "size" : 5632,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7027,6 +7036,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7130,27 +7160,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7753,7 +7762,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7808,7 +7817,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19014,7 +19023,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19029,7 +19038,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19047,7 +19056,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19062,7 +19071,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19080,7 +19089,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19152,7 +19161,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19218,7 +19227,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19233,7 +19242,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20049,7 +20058,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20082,7 +20091,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20775,7 +20784,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20799,7 +20808,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20823,7 +20832,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20889,7 +20898,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20973,7 +20982,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21021,7 +21030,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21033,10 +21042,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21048,7 +21057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21060,7 +21069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21081,7 +21090,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21099,7 +21108,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21117,7 +21126,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21135,7 +21144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21153,7 +21162,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21180,7 +21189,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21198,7 +21207,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21213,7 +21222,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21222,7 +21231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21243,7 +21252,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21261,7 +21270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21279,7 +21288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21297,7 +21306,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21315,7 +21324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21342,7 +21351,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21360,7 +21369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21378,7 +21387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21393,7 +21402,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIi",
@@ -22385,96 +22394,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22520,42 +22439,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22885,7 +22768,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -23102,41 +22985,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23219,51 +23067,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23273,15 +23076,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23471,6 +23265,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23914,7 +23717,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27281,24 +27084,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27524,42 +27309,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28393,7 +28142,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -28496,15 +28245,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28541,24 +28281,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31198,7 +30920,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31252,7 +30974,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31286,42 +31008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32111,7 +31797,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 164,
+   "size" : 228,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32279,7 +31965,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32369,7 +32055,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33020,7 +32706,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33129,7 +32815,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33155,16 +32841,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34135,7 +33811,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34145,46 +33821,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 4,
@@ -34245,96 +33881,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -35075,11 +34621,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39768,38 +39309,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -39972,22 +39481,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
+     "field_offset" : 1760,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
+     "field_offset" : 1768,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1264,
+     "field_offset" : 1776,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1280,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -39996,7 +39505,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 164,
+   "size" : 228,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45283,27 +44792,15 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1056,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1088,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
-     "field_offset" : 1120,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1216,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45311,7 +44808,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48148,6 +47645,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
@@ -49947,12 +49483,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 576,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -49960,7 +49496,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -52976,10 +52512,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -52989,10 +52522,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53002,7 +52532,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -53960,7 +53490,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -53968,7 +53498,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54457,60 +53987,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55309,7 +54785,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 24,
+   "size" : 88,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55547,325 +55023,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 13248,
+     "field_offset" : 46016,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 13280,
+     "field_offset" : 46048,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 13312,
+     "field_offset" : 46080,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 13344,
+     "field_offset" : 46112,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 13408,
+     "field_offset" : 46176,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 13472,
+     "field_offset" : 46240,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 13504,
+     "field_offset" : 46272,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 14016,
+     "field_offset" : 46784,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 14144,
+     "field_offset" : 46912,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 14176,
+     "field_offset" : 46944,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 14208,
+     "field_offset" : 46976,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 14240,
+     "field_offset" : 47008,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 14272,
+     "field_offset" : 47040,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 14304,
+     "field_offset" : 47072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 14336,
+     "field_offset" : 47104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 14368,
+     "field_offset" : 47136,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 14400,
+     "field_offset" : 47168,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 14408,
+     "field_offset" : 47176,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 14416,
+     "field_offset" : 47184,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 14432,
+     "field_offset" : 47200,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 14464,
+     "field_offset" : 47232,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 14592,
+     "field_offset" : 47360,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 14624,
+     "field_offset" : 47392,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 14656,
+     "field_offset" : 47424,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 14688,
+     "field_offset" : 47456,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 14720,
+     "field_offset" : 47488,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iPcEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 14752,
+     "field_offset" : 47520,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 14784,
+     "field_offset" : 47552,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 14816,
+     "field_offset" : 47584,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 14848,
+     "field_offset" : 47616,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 14880,
+     "field_offset" : 47648,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 14912,
+     "field_offset" : 47680,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 14944,
+     "field_offset" : 47712,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 15104,
+     "field_offset" : 48384,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 15168,
+     "field_offset" : 48448,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 15200,
+     "field_offset" : 48480,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 15208,
+     "field_offset" : 48488,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 15216,
+     "field_offset" : 48496,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 15232,
+     "field_offset" : 48512,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 15264,
+     "field_offset" : 48544,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 15296,
+     "field_offset" : 48576,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 15360,
+     "field_offset" : 48640,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 15424,
+     "field_offset" : 48704,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 15488,
+     "field_offset" : 48768,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 15520,
+     "field_offset" : 48800,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 15584,
+     "field_offset" : 48864,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 15648,
+     "field_offset" : 48928,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 15656,
+     "field_offset" : 48936,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 15664,
+     "field_offset" : 48944,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 15680,
+     "field_offset" : 48960,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 15712,
+     "field_offset" : 48992,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 15744,
+     "field_offset" : 49024,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 15840,
+     "field_offset" : 49120,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 15872,
+     "field_offset" : 49152,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55874,7 +55350,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 1988,
+   "size" : 6148,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56786,7 +56262,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56826,7 +56302,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56866,7 +56342,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56906,7 +56382,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
@@ -56946,7 +56422,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -56986,7 +56462,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57026,7 +56502,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57066,7 +56542,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57106,7 +56582,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57149,7 +56625,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57189,7 +56665,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58879,6 +58355,32 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "size" : 84,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "_ZTIN7android11FlattenableINS_9FenceTime8SnapshotEEE"
     }
    ],
@@ -59009,7 +58511,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86/source-based/libnativewindow.so.lsdump b/30/64/x86/source-based/libnativewindow.so.lsdump
index 57e3e39..f0508e4 100644
--- a/30/64/x86/source-based/libnativewindow.so.lsdump
+++ b/30/64/x86/source-based/libnativewindow.so.lsdump
@@ -1203,6 +1203,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1258,27 +1279,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1769,7 +1769,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2667,15 +2667,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2868,7 +2859,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/x86/source-based/libneuralnetworks.so.lsdump b/30/64/x86/source-based/libneuralnetworks.so.lsdump
index 0708192..d6197ff 100644
--- a/30/64/x86/source-based/libneuralnetworks.so.lsdump
+++ b/30/64/x86/source-based/libneuralnetworks.so.lsdump
@@ -2432,24 +2432,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2459,24 +2441,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2486,24 +2450,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2513,24 +2459,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2540,24 +2468,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2567,24 +2477,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2594,24 +2486,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2621,24 +2495,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2666,33 +2522,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2702,33 +2531,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2783,24 +2585,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2810,24 +2594,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2837,24 +2603,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2864,24 +2612,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2891,24 +2621,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2918,24 +2630,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2945,24 +2639,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2972,24 +2648,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3153,36 +2811,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 4,
@@ -3193,36 +2821,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 4,
diff --git a/30/64/x86/source-based/libvulkan.so.lsdump b/30/64/x86/source-based/libvulkan.so.lsdump
index 8547611..6345e58 100644
--- a/30/64/x86/source-based/libvulkan.so.lsdump
+++ b/30/64/x86/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 128,
@@ -872,27 +800,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11602,7 +11518,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11695,7 +11611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11716,7 +11632,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11734,7 +11650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11767,7 +11683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11788,7 +11704,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11806,7 +11722,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11830,7 +11746,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11863,7 +11779,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11887,7 +11803,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11914,7 +11830,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11941,7 +11857,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11965,7 +11881,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11992,7 +11908,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12022,7 +11938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12049,7 +11965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12082,7 +11998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12103,7 +12019,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12133,7 +12049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12151,7 +12067,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12175,7 +12091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12202,7 +12118,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12226,7 +12142,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12250,7 +12166,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12268,7 +12184,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12280,13 +12196,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12298,7 +12214,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12322,7 +12238,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12337,7 +12253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12376,7 +12292,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12403,7 +12319,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12421,7 +12337,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12442,7 +12358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12472,7 +12388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12487,7 +12403,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12508,7 +12424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12526,7 +12442,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12541,7 +12457,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12559,7 +12475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12574,7 +12490,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12595,7 +12511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12613,7 +12529,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12631,7 +12547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12649,7 +12565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12670,7 +12586,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12694,7 +12610,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12736,7 +12652,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12931,7 +12847,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13729,7 +13645,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13741,7 +13657,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13762,7 +13678,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13888,7 +13804,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -14302,7 +14218,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14320,7 +14236,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14338,7 +14254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14356,7 +14272,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14371,7 +14287,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14386,7 +14302,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14404,7 +14320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14422,7 +14338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14452,7 +14368,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14470,7 +14386,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14485,7 +14401,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14500,7 +14416,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14521,7 +14437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14536,7 +14452,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14551,7 +14467,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14569,7 +14485,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14587,7 +14503,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14620,7 +14536,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14641,7 +14557,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14659,7 +14575,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14680,7 +14596,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14701,7 +14617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14950,7 +14866,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15719,15 +15635,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -16853,78 +16760,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -16934,78 +16769,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17078,15 +16841,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP12VkInstance_T",
    "name" : "VkInstance_T **",
    "referenced_type" : "_ZTIP12VkInstance_T",
@@ -17096,18 +16850,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -17116,7 +16861,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17125,7 +16870,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17141,15 +16886,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -18550,86 +18286,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 4,
@@ -18640,86 +18296,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 4,
diff --git a/30/64/x86/source-based/libz.so.lsdump b/30/64/x86/source-based/libz.so.lsdump
index a062327..ef28159 100644
--- a/30/64/x86/source-based/libz.so.lsdump
+++ b/30/64/x86/source-based/libz.so.lsdump
@@ -2239,42 +2239,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/crc32.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/deflate.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_static/obj/external/zlib/trees.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
diff --git a/30/64/x86_64/source-based/libEGL.so.lsdump b/30/64/x86_64/source-based/libEGL.so.lsdump
index f37747e..dc8d0b4 100644
--- a/30/64/x86_64/source-based/libEGL.so.lsdump
+++ b/30/64/x86_64/source-based/libEGL.so.lsdump
@@ -2021,15 +2021,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/64/x86_64/source-based/libOpenMAXAL.so.lsdump b/30/64/x86_64/source-based/libOpenMAXAL.so.lsdump
index 89dbff4..573977c 100644
--- a/30/64/x86_64/source-based/libOpenMAXAL.so.lsdump
+++ b/30/64/x86_64/source-based/libOpenMAXAL.so.lsdump
@@ -5891,10 +5891,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26105,24 +26105,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26321,15 +26303,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26339,15 +26312,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26357,15 +26321,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26438,15 +26393,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26456,15 +26402,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26474,15 +26411,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26492,15 +26420,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26510,15 +26429,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26528,15 +26438,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_64_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36521,6 +36422,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38073,14 +37983,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38097,14 +37999,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38121,14 +38015,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38137,14 +38023,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38161,14 +38039,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38177,14 +38047,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38193,14 +38055,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38217,14 +38071,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38233,14 +38079,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38257,14 +38095,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39564,7 +39394,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39624,7 +39454,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41408,16 +41238,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 8,
@@ -43261,11 +43081,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52910,8 +52725,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 8256,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 8448,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52920,7 +52741,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54728,74 +54549,98 @@
     },
     {
      "access" : "private",
-     "field_name" : "mDeathNotifier",
+     "field_name" : "mPreviousTimestamp",
      "field_offset" : 2432,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 3264,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 3272,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDeathNotifier",
+     "field_offset" : 3328,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 2496,
+     "field_offset" : 3392,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 2528,
+     "field_offset" : 3424,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 2560,
+     "field_offset" : 3456,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 2592,
+     "field_offset" : 3488,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 4768,
+     "field_offset" : 5664,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 4800,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 4864,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 4992,
+     "field_offset" : 5888,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 5024,
+     "field_offset" : 5920,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 5056,
+     "field_offset" : 5952,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 5568,
+     "field_offset" : 6464,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 6656,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54804,7 +54649,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55186,6 +55031,60 @@
    ]
   },
   {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 8,
    "base_specifiers" :
@@ -57769,6 +57668,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57808,6 +57711,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67710,6 +67617,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67749,6 +67660,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68800,6 +68715,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68839,6 +68758,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76716,7 +76639,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_64/source-based/libOpenSLES.so.lsdump b/30/64/x86_64/source-based/libOpenSLES.so.lsdump
index 52d62d6..e54cdb5 100644
--- a/30/64/x86_64/source-based/libOpenSLES.so.lsdump
+++ b/30/64/x86_64/source-based/libOpenSLES.so.lsdump
@@ -5927,10 +5927,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26213,24 +26213,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26429,15 +26411,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26447,15 +26420,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26465,15 +26429,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26546,15 +26501,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26564,15 +26510,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26582,15 +26519,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26600,15 +26528,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26618,15 +26537,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26636,15 +26546,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_64_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36629,6 +36530,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38181,14 +38091,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38205,14 +38107,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38229,14 +38123,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38245,14 +38131,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38269,14 +38147,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38285,14 +38155,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38301,14 +38163,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38325,14 +38179,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38341,14 +38187,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38365,14 +38203,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39672,7 +39502,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39732,7 +39562,7 @@
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41516,16 +41346,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 8,
@@ -43369,11 +43189,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -53018,8 +52833,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 8256,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 8448,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53028,7 +52849,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 1040,
+   "size" : 1064,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54836,74 +54657,98 @@
     },
     {
      "access" : "private",
-     "field_name" : "mDeathNotifier",
+     "field_name" : "mPreviousTimestamp",
      "field_offset" : 2432,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 3264,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 3272,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDeathNotifier",
+     "field_offset" : 3328,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 2496,
+     "field_offset" : 3392,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 2528,
+     "field_offset" : 3424,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 2560,
+     "field_offset" : 3456,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 2592,
+     "field_offset" : 3488,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 4768,
+     "field_offset" : 5664,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 4800,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 4864,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 4992,
+     "field_offset" : 5888,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 5024,
+     "field_offset" : 5920,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 5056,
+     "field_offset" : 5952,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 5568,
+     "field_offset" : 6464,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 6656,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54912,7 +54757,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 720,
+   "size" : 856,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55294,6 +55139,60 @@
    ]
   },
   {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 16,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 8,
    "base_specifiers" :
@@ -57877,6 +57776,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57916,6 +57819,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67818,6 +67725,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67857,6 +67768,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68908,6 +68823,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68947,6 +68866,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76824,7 +76747,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_64/source-based/libaaudio.so.lsdump b/30/64/x86_64/source-based/libaaudio.so.lsdump
index a1fb110..2017dcb 100644
--- a/30/64/x86_64/source-based/libaaudio.so.lsdump
+++ b/30/64/x86_64/source-based/libaaudio.so.lsdump
@@ -442,7 +442,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -536,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -615,7 +615,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/64/x86_64/source-based/libandroid.so.lsdump b/30/64/x86_64/source-based/libandroid.so.lsdump
index 591f864..363ed81 100644
--- a/30/64/x86_64/source-based/libandroid.so.lsdump
+++ b/30/64/x86_64/source-based/libandroid.so.lsdump
@@ -1891,6 +1891,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1946,27 +1967,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2277,7 +2277,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2752,51 +2752,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_64_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_64_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_64_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_64_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2989,7 +2944,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/x86_64/source-based/libbinder_ndk.so.lsdump b/30/64/x86_64/source-based/libbinder_ndk.so.lsdump
index 991fa9a..021c0d2 100644
--- a/30/64/x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/30/64/x86_64/source-based/libbinder_ndk.so.lsdump
@@ -3143,7 +3143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3743,7 +3743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6262,7 +6262,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6376,7 +6376,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6388,7 +6388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6460,7 +6460,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6514,7 +6514,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6532,7 +6532,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6541,7 +6541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6553,7 +6553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6565,7 +6565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6580,7 +6580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6601,7 +6601,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6616,7 +6616,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6634,7 +6634,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6649,7 +6649,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6667,7 +6667,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6682,7 +6682,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6700,7 +6700,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6715,7 +6715,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6733,7 +6733,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6748,7 +6748,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6766,7 +6766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPl"
@@ -6781,7 +6781,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6799,7 +6799,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6814,7 +6814,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6835,7 +6835,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6850,7 +6850,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6868,7 +6868,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6889,10 +6889,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6904,7 +6904,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6919,7 +6919,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6937,7 +6937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -6952,7 +6952,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6970,7 +6970,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6985,7 +6985,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7000,7 +7000,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7021,7 +7021,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7036,7 +7036,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7054,7 +7054,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7069,7 +7069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7087,7 +7087,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7102,7 +7102,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7120,7 +7120,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7135,7 +7135,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7153,7 +7153,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7168,7 +7168,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7186,7 +7186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIl"
@@ -7201,7 +7201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKl"
@@ -7219,7 +7219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7234,7 +7234,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7255,7 +7255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7270,7 +7270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7288,7 +7288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7309,10 +7309,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7324,7 +7324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7339,7 +7339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7357,7 +7357,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -7372,7 +7372,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -7390,7 +7390,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7408,7 +7408,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7420,7 +7420,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7429,7 +7429,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7456,7 +7456,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7471,7 +7471,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7483,7 +7483,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7498,7 +7498,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7510,7 +7510,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7519,7 +7519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7531,7 +7531,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7543,7 +7543,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7555,7 +7555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7567,7 +7567,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7579,7 +7579,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7588,7 +7588,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9983,15 +9983,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10037,24 +10028,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10064,24 +10037,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10091,15 +10046,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10226,15 +10172,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10244,15 +10181,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10280,24 +10208,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/64/x86_64/source-based/libc.so.lsdump b/30/64/x86_64/source-based/libc.so.lsdump
index 5a34eaa..ec7ec71 100644
--- a/30/64/x86_64/source-based/libc.so.lsdump
+++ b/30/64/x86_64/source-based/libc.so.lsdump
@@ -7,7 +7,7 @@
    "name" : "char [0]",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA0_c",
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_info.h"
   },
   {
    "alignment" : 1,
@@ -357,7 +357,7 @@
    "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
-   "name" : "bool",
+   "name" : "_Bool",
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIb",
    "size" : 1
@@ -6076,7 +6076,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPKvS0_E",
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -6351,7 +6351,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -6375,7 +6375,7 @@
      "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -6399,7 +6399,7 @@
      "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -6531,7 +6531,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -6555,7 +6555,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -7374,7 +7374,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -7389,7 +7389,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -7407,7 +7407,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPi",
@@ -7443,7 +7443,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7458,7 +7458,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -7473,7 +7473,7 @@
      "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7524,7 +7524,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7593,7 +7593,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIl",
@@ -8517,7 +8517,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9273,7 +9273,7 @@
      "referenced_type" : "_ZTIPm"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -9288,7 +9288,7 @@
      "referenced_type" : "_ZTIPm"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11139,7 +11139,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -11442,7 +11442,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_x86_64_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -11718,7 +11718,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11733,7 +11733,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -11790,7 +11790,7 @@
      "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/vasprintf.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11808,7 +11808,7 @@
      "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/vdprintf.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11844,7 +11844,7 @@
      "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/gen/verrx.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIv",
@@ -11862,7 +11862,7 @@
      "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/vsscanf.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11883,7 +11883,7 @@
      "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/vswprintf.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11901,7 +11901,7 @@
      "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/vswscanf.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11916,7 +11916,7 @@
      "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/gen/vwarn.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIv",
@@ -11931,7 +11931,7 @@
      "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/gen/vwarnx.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "return_type" : "_ZTIv",
@@ -13177,7 +13177,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 8,
@@ -13330,7 +13330,7 @@
    "referenced_type" : "_ZTIFiPKvS0_E",
    "self_type" : "_ZTIPFiPKvS0_E",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 8,
@@ -13415,348 +13415,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_64_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_64_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_64_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_64_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_64_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_64_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_64_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_64_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_64_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK10elf64_phdr",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "_ZTIK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_64_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf64_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_64_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK11ContextNode",
    "name" : "const ContextNode *",
    "referenced_type" : "_ZTIK11ContextNode",
@@ -13838,24 +13496,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -13865,24 +13505,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -13906,7 +13528,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 8,
@@ -13919,24 +13541,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_64_static/obj/bionic/libc/bionic/fortify.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_64_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_64_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14221,7 +13825,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/context_node.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/contexts_pre_split.h"
   },
   {
    "alignment" : 8,
@@ -14248,7 +13852,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 8,
@@ -14257,7 +13861,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_area.h"
   },
   {
    "alignment" : 8,
@@ -14312,96 +13916,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_64_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_64_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_64_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 520,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
@@ -14575,7 +14089,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 8,
@@ -14763,7 +14277,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -14773,7 +14287,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/core/property_service/libpropertyinfoparser/include/property_info_parser/property_info_parser.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/prop_info.h"
   },
   {
    "alignment" : 8,
diff --git a/30/64/x86_64/source-based/libcamera2ndk.so.lsdump b/30/64/x86_64/source-based/libcamera2ndk.so.lsdump
index d97c479..55a14b2 100644
--- a/30/64/x86_64/source-based/libcamera2ndk.so.lsdump
+++ b/30/64/x86_64/source-based/libcamera2ndk.so.lsdump
@@ -2593,6 +2593,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3127,27 +3148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4887,7 +4887,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4899,7 +4899,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4908,7 +4908,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4923,7 +4923,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4935,10 +4935,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4950,7 +4950,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4959,7 +4959,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4974,7 +4974,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4983,7 +4983,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4998,7 +4998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5007,7 +5007,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5022,7 +5022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5034,10 +5034,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5049,7 +5049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5100,7 +5100,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5121,13 +5121,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5316,10 +5316,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5328,7 +5328,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5346,7 +5346,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5355,7 +5355,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5373,7 +5373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5391,7 +5391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -5409,7 +5409,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5436,7 +5436,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5451,10 +5451,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5463,7 +5463,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5475,7 +5475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5493,7 +5493,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5511,7 +5511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5532,7 +5532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5547,7 +5547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5562,7 +5562,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5583,7 +5583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5604,7 +5604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5625,7 +5625,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5646,7 +5646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5670,7 +5670,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5694,7 +5694,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5718,7 +5718,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5742,7 +5742,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5766,7 +5766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5790,7 +5790,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5811,7 +5811,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5832,7 +5832,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5901,7 +5901,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5928,7 +5928,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5949,7 +5949,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5961,7 +5961,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5979,7 +5979,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6388,15 +6388,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6424,60 +6415,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6487,69 +6424,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6559,69 +6433,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6631,15 +6442,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6658,15 +6460,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6685,15 +6478,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6811,24 +6595,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6847,27 +6613,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 8,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6883,15 +6631,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6903,7 +6642,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 8,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6919,15 +6658,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6937,15 +6667,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6955,60 +6676,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/64/x86_64/source-based/libjnigraphics.so.lsdump b/30/64/x86_64/source-based/libjnigraphics.so.lsdump
index 75b1d28..a96f4ef 100644
--- a/30/64/x86_64/source-based/libjnigraphics.so.lsdump
+++ b/30/64/x86_64/source-based/libjnigraphics.so.lsdump
@@ -8914,7 +8914,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -9561,15 +9561,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 8,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -10593,7 +10584,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 8,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19147,11 +19138,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -25685,7 +25671,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_64/source-based/libm.so.lsdump b/30/64/x86_64/source-based/libm.so.lsdump
index b682e3e..61b1c88 100644
--- a/30/64/x86_64/source-based/libm.so.lsdump
+++ b/30/64/x86_64/source-based/libm.so.lsdump
@@ -332,7 +332,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA5_d",
    "size" : 40,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j1.c"
   },
   {
    "alignment" : 4,
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA6_d",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j1.c"
   },
   {
    "alignment" : 4,
@@ -4740,7 +4740,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/math.h"
+   "source_file" : "/external/arm-optimized-routines/math/sincosf.c"
   },
   {
    "alignment" : 8,
@@ -4749,7 +4749,7 @@
    "referenced_type" : "_ZTIg",
    "self_type" : "_ZTIPg",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-netbsd/lib/libm/complex/cephes_subrl.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 8,
@@ -4889,7 +4889,7 @@
    "referenced_type" : "_ZTIA2_d",
    "self_type" : "_ZTIA2_Kd",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquo.c"
   },
   {
    "alignment" : 4,
@@ -4899,7 +4899,7 @@
    "referenced_type" : "_ZTIA2_f",
    "self_type" : "_ZTIA2_Kf",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_rintl.c"
   },
   {
    "alignment" : 16,
@@ -4909,7 +4909,7 @@
    "referenced_type" : "_ZTIA2_g",
    "self_type" : "_ZTIA2_Kg",
    "size" : 32,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodl.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquol.c"
   },
   {
    "alignment" : 4,
@@ -4949,7 +4949,7 @@
    "referenced_type" : "_ZTIA5_d",
    "self_type" : "_ZTIA5_Kd",
    "size" : 40,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j1.c"
   },
   {
    "alignment" : 4,
@@ -4989,7 +4989,7 @@
    "referenced_type" : "_ZTIA6_d",
    "self_type" : "_ZTIA6_Kd",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j1.c"
   },
   {
    "alignment" : 4,
@@ -5135,7 +5135,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_clog.c"
   },
   {
    "alignment" : 4,
@@ -5145,7 +5145,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_clogf.c"
   },
   {
    "alignment" : 16,
@@ -5155,7 +5155,7 @@
    "referenced_type" : "_ZTIg",
    "self_type" : "_ZTIKg",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-netbsd/lib/libm/complex/cephes_subrl.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_lround.c"
   },
   {
    "alignment" : 4,
@@ -5165,7 +5165,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cexp.c"
   },
   {
    "alignment" : 8,
@@ -5176,7 +5176,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIVKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_tanhl.c"
   },
   {
    "alignment" : 4,
@@ -5187,7 +5187,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
   },
   {
    "alignment" : 16,
@@ -5208,7 +5208,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_log1pf.c"
   },
   {
    "alignment" : 16,
@@ -5218,7 +5218,7 @@
    "referenced_type" : "_ZTIg",
    "self_type" : "_ZTIVg",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_atan2l.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/ld128/s_exp2l.c"
   }
  ],
  "record_types" :
@@ -5743,27 +5743,6 @@
    "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "hi",
-     "referenced_type" : "_ZTId"
-    },
-    {
-     "field_name" : "lo",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTId"
-    }
-   ],
-   "linker_set_key" : "_ZTI2dd",
-   "name" : "dd",
-   "referenced_type" : "_ZTI2dd",
-   "self_type" : "_ZTI2dd",
-   "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_fma.c"
-  },
-  {
    "alignment" : 16,
    "fields" :
    [
@@ -5779,12 +5758,33 @@
    ],
    "linker_set_key" : "_ZTI2dd",
    "name" : "dd",
-   "referenced_type" : "_ZTI2dd#ODR:out/soong/.intermediates/bionic/libm/libm/android_x86_64_static/obj/bionic/libm/upstream-freebsd/lib/msun/src/s_fmal.sdump",
-   "self_type" : "_ZTI2dd#ODR:out/soong/.intermediates/bionic/libm/libm/android_x86_64_static/obj/bionic/libm/upstream-freebsd/lib/msun/src/s_fmal.sdump",
+   "referenced_type" : "_ZTI2dd",
+   "self_type" : "_ZTI2dd",
    "size" : 32,
    "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_fmal.c"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "hi",
+     "referenced_type" : "_ZTId"
+    },
+    {
+     "field_name" : "lo",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTId"
+    }
+   ],
+   "linker_set_key" : "_ZTI2dd",
+   "name" : "dd",
+   "referenced_type" : "_ZTI2dd#ODR:out/soong/.intermediates/bionic/libm/libm/android_x86_64_static/obj/bionic/libm/upstream-freebsd/lib/msun/src/s_fma.sdump",
+   "self_type" : "_ZTI2dd#ODR:out/soong/.intermediates/bionic/libm/libm/android_x86_64_static/obj/bionic/libm/upstream-freebsd/lib/msun/src/s_fma.sdump",
+   "size" : 16,
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_fma.c"
+  },
+  {
    "alignment" : 16,
    "fields" :
    [
@@ -6368,7 +6368,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -6390,7 +6390,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/64/x86_64/source-based/libmediandk.so.lsdump b/30/64/x86_64/source-based/libmediandk.so.lsdump
index e38b9f8..5e745f6 100644
--- a/30/64/x86_64/source-based/libmediandk.so.lsdump
+++ b/30/64/x86_64/source-based/libmediandk.so.lsdump
@@ -356,11 +356,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 3072,
+   "size" : 7168,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7036,6 +7045,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7139,27 +7169,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7762,7 +7771,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7817,7 +7826,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -14908,7 +14917,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "referenced_type" : "_ZTIFiP13ANativeWindowPFiS0_iP13__va_list_tagEPviS2_E",
@@ -14986,7 +14995,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP13__va_list_tag#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
    "referenced_type" : "_ZTIFiP13ANativeWindowiP13__va_list_tagE",
@@ -19038,7 +19047,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19053,7 +19062,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19071,7 +19080,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19086,7 +19095,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19104,7 +19113,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19176,7 +19185,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19242,7 +19251,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19257,7 +19266,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20073,7 +20082,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20106,7 +20115,7 @@
      "referenced_type" : "_ZTIm"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20799,7 +20808,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20823,7 +20832,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20847,7 +20856,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20913,7 +20922,7 @@
      "referenced_type" : "_ZTIm"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20997,7 +21006,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21045,7 +21054,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21057,10 +21066,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21072,7 +21081,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21084,7 +21093,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21105,7 +21114,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21123,7 +21132,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21141,7 +21150,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21159,7 +21168,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21177,7 +21186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21204,7 +21213,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21222,7 +21231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21237,7 +21246,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21246,7 +21255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21267,7 +21276,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21285,7 +21294,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21303,7 +21312,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21321,7 +21330,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21339,7 +21348,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21366,7 +21375,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21384,7 +21393,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21402,7 +21411,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21417,7 +21426,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIl",
@@ -22409,96 +22418,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22544,42 +22463,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22909,7 +22792,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 8,
@@ -23126,41 +23009,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23243,51 +23091,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23297,15 +23100,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23495,6 +23289,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23938,7 +23741,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27314,24 +27117,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27557,42 +27342,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28426,7 +28175,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 8,
@@ -28529,15 +28278,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28574,24 +28314,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31231,7 +30953,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 8,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31285,7 +31007,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 8,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31319,42 +31041,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32153,7 +31839,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 216,
+   "size" : 280,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32321,7 +32007,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32411,7 +32097,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 184,
+   "size" : 248,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33062,7 +32748,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33171,7 +32857,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 40,
+   "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33197,16 +32883,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34177,7 +33853,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34187,46 +33863,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 8,
@@ -34287,96 +33923,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 8,
@@ -35127,11 +34673,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39820,38 +39361,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -40024,22 +39533,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1664,
+     "field_offset" : 2176,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1672,
+     "field_offset" : 2184,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1680,
+     "field_offset" : 2192,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1696,
+     "field_offset" : 2208,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -40048,7 +39557,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 216,
+   "size" : 280,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45335,14 +44844,8 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1792,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1824,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIj"
     },
     {
@@ -45350,12 +44853,6 @@
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1856,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvmEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 2048,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45363,7 +44860,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48200,6 +47697,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EEE",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -49999,12 +49535,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 768,
+     "field_offset" : 1280,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 832,
+     "field_offset" : 1344,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -50012,7 +49548,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 184,
+   "size" : 248,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -53028,10 +52564,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -53041,10 +52574,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53054,7 +52584,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -54012,7 +53542,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELm4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -54020,7 +53550,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 40,
+   "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54509,60 +54039,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55361,7 +54837,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 48,
+   "size" : 112,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55599,325 +55075,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 26304,
+     "field_offset" : 59072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 26336,
+     "field_offset" : 59104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 26368,
+     "field_offset" : 59136,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 26432,
+     "field_offset" : 59200,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 26496,
+     "field_offset" : 59264,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 26560,
+     "field_offset" : 59328,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 26624,
+     "field_offset" : 59392,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 27264,
+     "field_offset" : 60032,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 27392,
+     "field_offset" : 60160,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 27424,
+     "field_offset" : 60192,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 27456,
+     "field_offset" : 60224,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 27488,
+     "field_offset" : 60256,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 27520,
+     "field_offset" : 60288,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 27552,
+     "field_offset" : 60320,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 27584,
+     "field_offset" : 60352,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 27616,
+     "field_offset" : 60384,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 27648,
+     "field_offset" : 60416,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 27656,
+     "field_offset" : 60424,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 27664,
+     "field_offset" : 60432,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 27680,
+     "field_offset" : 60448,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 28000,
+     "field_offset" : 60768,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 29120,
+     "field_offset" : 61888,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 29184,
+     "field_offset" : 61952,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 29248,
+     "field_offset" : 62016,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 29312,
+     "field_offset" : 62080,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 29376,
+     "field_offset" : 62144,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iP13__va_list_tagEPviS2_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 29440,
+     "field_offset" : 62208,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 29504,
+     "field_offset" : 62272,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 29568,
+     "field_offset" : 62336,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 29632,
+     "field_offset" : 62400,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 29696,
+     "field_offset" : 62464,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 29760,
+     "field_offset" : 62528,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 29824,
+     "field_offset" : 62592,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 30144,
+     "field_offset" : 63424,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 30208,
+     "field_offset" : 63488,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 30240,
+     "field_offset" : 63520,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 30248,
+     "field_offset" : 63528,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 30256,
+     "field_offset" : 63536,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 30272,
+     "field_offset" : 63552,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 30304,
+     "field_offset" : 63584,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 30336,
+     "field_offset" : 63616,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 30400,
+     "field_offset" : 63680,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 30464,
+     "field_offset" : 63744,
      "referenced_type" : "_ZTIl"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 30528,
+     "field_offset" : 63808,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 30912,
+     "field_offset" : 64192,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 30976,
+     "field_offset" : 64256,
      "referenced_type" : "_ZTIm"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 31040,
+     "field_offset" : 64320,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 31048,
+     "field_offset" : 64328,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 31056,
+     "field_offset" : 64336,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 31104,
+     "field_offset" : 64384,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 31168,
+     "field_offset" : 64448,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 31232,
+     "field_offset" : 64512,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 31424,
+     "field_offset" : 64704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 31488,
+     "field_offset" : 64768,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55926,7 +55402,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 3944,
+   "size" : 8104,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56838,7 +56314,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56878,7 +56354,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56918,7 +56394,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56958,7 +56434,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E",
@@ -56998,7 +56474,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -57038,7 +56514,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57078,7 +56554,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57118,7 +56594,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57158,7 +56634,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57201,7 +56677,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57241,7 +56717,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58931,6 +58407,32 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lm4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELm4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELm4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELm4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELm4EEE",
+   "size" : 104,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "_ZTIN7android11FlattenableINS_9FenceTime8SnapshotEEE"
     }
    ],
@@ -59061,7 +58563,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_64/source-based/libnativewindow.so.lsdump b/30/64/x86_64/source-based/libnativewindow.so.lsdump
index 69b2a8c..8aa459e 100644
--- a/30/64/x86_64/source-based/libnativewindow.so.lsdump
+++ b/30/64/x86_64/source-based/libnativewindow.so.lsdump
@@ -1194,6 +1194,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1249,27 +1270,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1760,7 +1760,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2667,15 +2667,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2868,7 +2859,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 264,
+   "size" : 256,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/x86_64/source-based/libneuralnetworks.so.lsdump b/30/64/x86_64/source-based/libneuralnetworks.so.lsdump
index a47f993..127cad2 100644
--- a/30/64/x86_64/source-based/libneuralnetworks.so.lsdump
+++ b/30/64/x86_64/source-based/libneuralnetworks.so.lsdump
@@ -2451,24 +2451,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2478,24 +2460,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2505,24 +2469,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2532,24 +2478,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2559,24 +2487,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2586,24 +2496,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2613,24 +2505,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2640,24 +2514,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2685,33 +2541,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2721,33 +2550,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2802,24 +2604,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2829,24 +2613,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2856,24 +2622,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2883,24 +2631,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2910,24 +2640,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2937,24 +2649,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2964,24 +2658,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2991,24 +2667,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3172,36 +2830,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 8,
@@ -3212,36 +2840,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 8,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 8,
diff --git a/30/64/x86_64/source-based/libvulkan.so.lsdump b/30/64/x86_64/source-based/libvulkan.so.lsdump
index 6619d38..3af91af 100644
--- a/30/64/x86_64/source-based/libvulkan.so.lsdump
+++ b/30/64/x86_64/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 256,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 256,
@@ -872,27 +800,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11521,16 +11437,16 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkSwapchainKHR_T"
     },
     {
      "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP13VkSemaphore_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -11602,7 +11518,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11620,10 +11536,10 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -11659,10 +11575,10 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -11695,7 +11611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -11716,7 +11632,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11734,13 +11650,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
     },
     {
-     "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPipelineLayout_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11767,10 +11683,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -11788,13 +11704,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
     },
     {
-     "referenced_type" : "_ZTIP12VkPipeline_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP12VkPipeline_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -11806,7 +11722,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11830,16 +11746,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11863,7 +11779,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11887,10 +11803,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11914,10 +11830,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11941,13 +11857,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11965,13 +11881,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -11992,16 +11908,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -12022,16 +11938,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12049,7 +11965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -12061,7 +11977,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12082,7 +11998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12103,7 +12019,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12133,10 +12049,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12151,7 +12067,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12175,7 +12091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12202,10 +12118,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12226,10 +12142,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12250,7 +12166,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -12268,7 +12184,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12280,13 +12196,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12298,10 +12214,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12322,7 +12238,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12337,7 +12253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12376,10 +12292,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPipelineLayout_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12403,7 +12319,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP9VkEvent_T"
@@ -12421,7 +12337,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP13VkQueryPool_T"
@@ -12442,16 +12358,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTI13VkImageLayout"
@@ -12472,7 +12388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12487,7 +12403,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12508,7 +12424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12526,7 +12442,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12541,7 +12457,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP9VkEvent_T"
@@ -12559,7 +12475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12574,7 +12490,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12595,7 +12511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12613,7 +12529,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12631,7 +12547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12649,7 +12565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12670,10 +12586,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12694,7 +12610,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12736,7 +12652,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12931,7 +12847,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13294,7 +13210,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13312,7 +13228,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkBufferView_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13330,7 +13246,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13348,7 +13264,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkDescriptorPool_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13366,7 +13282,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13435,7 +13351,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13453,7 +13369,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkFramebuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkFramebuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13471,7 +13387,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13489,7 +13405,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP13VkImageView_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13522,7 +13438,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP12VkPipeline_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP12VkPipeline_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13558,7 +13474,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPipelineLayout_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13594,7 +13510,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkRenderPass_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkRenderPass_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13612,7 +13528,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP11VkSampler_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13630,7 +13546,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13648,7 +13564,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP13VkSemaphore_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13666,7 +13582,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkShaderModule_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkShaderModule_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13684,7 +13600,7 @@
      "referenced_type" : "_ZTIP12VkInstance_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13702,7 +13618,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkSwapchainKHR_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13729,7 +13645,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13741,7 +13657,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13762,7 +13678,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13882,13 +13798,13 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -13903,7 +13819,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkDescriptorPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -13924,7 +13840,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkAllocationCallbacks"
@@ -13960,7 +13876,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP10VkBuffer_T"
     },
     {
      "referenced_type" : "_ZTIP20VkMemoryRequirements"
@@ -14053,7 +13969,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14071,7 +13987,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -14158,7 +14074,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -14173,7 +14089,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIP20VkMemoryRequirements"
@@ -14209,7 +14125,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14251,7 +14167,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkImage_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkImageSubresource"
@@ -14302,7 +14218,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14320,7 +14236,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14338,7 +14254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14356,7 +14272,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14371,7 +14287,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14386,7 +14302,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14404,7 +14320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14422,7 +14338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14452,7 +14368,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14470,7 +14386,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14485,7 +14401,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14500,10 +14416,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14521,7 +14437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14536,7 +14452,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14551,7 +14467,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14569,7 +14485,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14587,7 +14503,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14620,7 +14536,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14641,10 +14557,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIP24VkSurfaceCapabilitiesKHR"
@@ -14659,10 +14575,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14680,10 +14596,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14701,13 +14617,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkSurfaceKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14779,7 +14695,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP14VkRenderPass_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP14VkRenderPass_T"
     },
     {
      "referenced_type" : "_ZTIP10VkExtent2D"
@@ -14797,7 +14713,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkSwapchainKHR_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14836,7 +14752,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -14890,7 +14806,7 @@
      "referenced_type" : "_ZTIPK16VkBindSparseInfo"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -14926,7 +14842,7 @@
      "referenced_type" : "_ZTIPK12VkSubmitInfo"
     },
     {
-     "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP9VkFence_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -14950,7 +14866,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14968,7 +14884,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14986,7 +14902,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkDescriptorPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15052,7 +14968,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP15VkCommandPool_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15070,7 +14986,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP16VkDeviceMemory_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15085,7 +15001,7 @@
      "referenced_type" : "_ZTIP10VkDevice_T"
     },
     {
-     "referenced_type" : "_ZTIP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkDescriptorSet_T"
     },
     {
      "referenced_type" : "_ZTIP28VkDescriptorUpdateTemplate_T"
@@ -15989,15 +15905,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -17123,15 +17030,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP10VkBuffer_T",
-   "name" : "VkBuffer_T *const *",
-   "referenced_type" : "_ZTIKP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP11VkSampler_T",
    "name" : "VkSampler_T *const *",
    "referenced_type" : "_ZTIKP11VkSampler_T",
@@ -17141,78 +17039,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP11VkSampler_T",
-   "name" : "VkSampler_T *const *",
-   "referenced_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP13VkImageView_T",
    "name" : "VkImageView_T *const *",
    "referenced_type" : "_ZTIKP13VkImageView_T",
@@ -17222,78 +17048,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkImageView_T",
-   "name" : "VkImageView_T *const *",
-   "referenced_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
    "name" : "VkSemaphore_T *const *",
    "referenced_type" : "_ZTIKP13VkSemaphore_T",
@@ -17303,78 +17057,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const *",
-   "referenced_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP14VkBufferView_T",
    "name" : "VkBufferView_T *const *",
    "referenced_type" : "_ZTIKP14VkBufferView_T",
@@ -17384,78 +17066,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const *",
-   "referenced_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
    "name" : "VkSwapchainKHR_T *const *",
    "referenced_type" : "_ZTIKP16VkSwapchainKHR_T",
@@ -17465,78 +17075,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const *",
-   "referenced_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const *",
    "referenced_type" : "_ZTIKP17VkCommandBuffer_T",
@@ -17546,78 +17084,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP17VkDescriptorSet_T",
    "name" : "VkDescriptorSet_T *const *",
    "referenced_type" : "_ZTIKP17VkDescriptorSet_T",
@@ -17627,15 +17093,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkDescriptorSet_T",
-   "name" : "VkDescriptorSet_T *const *",
-   "referenced_type" : "_ZTIKP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP17VkPipelineCache_T",
    "name" : "VkPipelineCache_T *const *",
    "referenced_type" : "_ZTIKP17VkPipelineCache_T",
@@ -17645,15 +17102,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP17VkPipelineCache_T",
-   "name" : "VkPipelineCache_T *const *",
-   "referenced_type" : "_ZTIKP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -17663,78 +17111,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
    "name" : "VkDescriptorSetLayout_T *const *",
    "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T",
@@ -17744,78 +17120,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const *",
-   "referenced_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
    "name" : "VkAccelerationStructureNV_T *const *",
    "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T",
@@ -17825,78 +17129,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const *",
-   "referenced_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP9VkEvent_T",
    "name" : "VkEvent_T *const *",
    "referenced_type" : "_ZTIKP9VkEvent_T",
@@ -17906,15 +17138,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP9VkEvent_T",
-   "name" : "VkEvent_T *const *",
-   "referenced_type" : "_ZTIKP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKP9VkFence_T",
    "name" : "VkFence_T *const *",
    "referenced_type" : "_ZTIKP9VkFence_T",
@@ -17924,15 +17147,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKP9VkFence_T",
-   "name" : "VkFence_T *const *",
-   "referenced_type" : "_ZTIKP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17998,7 +17212,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP10VkBuffer_T",
    "name" : "VkBuffer_T **",
-   "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP10VkBuffer_T",
    "self_type" : "_ZTIPP10VkBuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18014,18 +17228,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP11VkSampler_T",
    "name" : "VkSampler_T **",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP11VkSampler_T",
    "self_type" : "_ZTIPP11VkSampler_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18041,18 +17246,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP12VkPipeline_T",
    "name" : "VkPipeline_T **",
-   "referenced_type" : "_ZTIP12VkPipeline_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP12VkPipeline_T",
    "self_type" : "_ZTIPP12VkPipeline_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18061,7 +17257,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP13VkImageView_T",
    "name" : "VkImageView_T **",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP13VkImageView_T",
    "self_type" : "_ZTIPP13VkImageView_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18077,18 +17273,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP13VkQueryPool_T",
-   "name" : "VkQueryPool_T **",
-   "referenced_type" : "_ZTIP13VkQueryPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP13VkQueryPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP13VkSemaphore_T",
    "name" : "VkSemaphore_T **",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP13VkSemaphore_T",
    "self_type" : "_ZTIPP13VkSemaphore_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18097,7 +17284,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP14VkBufferView_T",
    "name" : "VkBufferView_T **",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP14VkBufferView_T",
    "self_type" : "_ZTIPP14VkBufferView_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18106,7 +17293,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP14VkRenderPass_T",
    "name" : "VkRenderPass_T **",
-   "referenced_type" : "_ZTIP14VkRenderPass_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP14VkRenderPass_T",
    "self_type" : "_ZTIPP14VkRenderPass_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18115,7 +17302,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP14VkSurfaceKHR_T",
    "name" : "VkSurfaceKHR_T **",
-   "referenced_type" : "_ZTIP14VkSurfaceKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP14VkSurfaceKHR_T",
    "self_type" : "_ZTIPP14VkSurfaceKHR_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -18124,7 +17311,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -18133,7 +17320,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP15VkCommandPool_T",
    "name" : "VkCommandPool_T **",
-   "referenced_type" : "_ZTIP15VkCommandPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15VkCommandPool_T",
    "self_type" : "_ZTIPP15VkCommandPool_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18142,7 +17329,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP15VkFramebuffer_T",
    "name" : "VkFramebuffer_T **",
-   "referenced_type" : "_ZTIP15VkFramebuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15VkFramebuffer_T",
    "self_type" : "_ZTIPP15VkFramebuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18151,7 +17338,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP16VkDeviceMemory_T",
    "name" : "VkDeviceMemory_T **",
-   "referenced_type" : "_ZTIP16VkDeviceMemory_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP16VkDeviceMemory_T",
    "self_type" : "_ZTIPP16VkDeviceMemory_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18160,7 +17347,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP16VkShaderModule_T",
    "name" : "VkShaderModule_T **",
-   "referenced_type" : "_ZTIP16VkShaderModule_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP16VkShaderModule_T",
    "self_type" : "_ZTIPP16VkShaderModule_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18169,7 +17356,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP16VkSwapchainKHR_T",
    "name" : "VkSwapchainKHR_T **",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP16VkSwapchainKHR_T",
    "self_type" : "_ZTIPP16VkSwapchainKHR_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18178,7 +17365,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18187,7 +17374,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP17VkDescriptorSet_T",
    "name" : "VkDescriptorSet_T **",
-   "referenced_type" : "_ZTIP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkDescriptorSet_T",
    "self_type" : "_ZTIPP17VkDescriptorSet_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18203,18 +17390,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP17VkPipelineCache_T",
-   "name" : "VkPipelineCache_T **",
-   "referenced_type" : "_ZTIP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP18VkDescriptorPool_T",
    "name" : "VkDescriptorPool_T **",
-   "referenced_type" : "_ZTIP18VkDescriptorPool_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkDescriptorPool_T",
    "self_type" : "_ZTIPP18VkDescriptorPool_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18223,7 +17401,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18232,7 +17410,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP18VkPipelineLayout_T",
    "name" : "VkPipelineLayout_T **",
-   "referenced_type" : "_ZTIP18VkPipelineLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPipelineLayout_T",
    "self_type" : "_ZTIPP18VkPipelineLayout_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18241,7 +17419,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP23VkDescriptorSetLayout_T",
    "name" : "VkDescriptorSetLayout_T **",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T",
    "self_type" : "_ZTIPP23VkDescriptorSetLayout_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18250,7 +17428,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP26VkSamplerYcbcrConversion_T",
    "name" : "VkSamplerYcbcrConversion_T **",
-   "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP26VkSamplerYcbcrConversion_T",
    "self_type" : "_ZTIPP26VkSamplerYcbcrConversion_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18266,15 +17444,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP28VkDescriptorUpdateTemplate_T",
-   "name" : "VkDescriptorUpdateTemplate_T **",
-   "referenced_type" : "_ZTIP28VkDescriptorUpdateTemplate_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP28VkDescriptorUpdateTemplate_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP9VkEvent_T",
    "name" : "VkEvent_T **",
    "referenced_type" : "_ZTIP9VkEvent_T",
@@ -18284,18 +17453,9 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP9VkEvent_T",
-   "name" : "VkEvent_T **",
-   "referenced_type" : "_ZTIP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPP9VkFence_T",
    "name" : "VkFence_T **",
-   "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP9VkFence_T",
    "self_type" : "_ZTIPP9VkFence_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18304,7 +17464,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP9VkImage_T",
    "name" : "VkImage_T **",
-   "referenced_type" : "_ZTIP9VkImage_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP9VkImage_T",
    "self_type" : "_ZTIPP9VkImage_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -18320,15 +17480,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -19729,7 +18880,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP10VkBuffer_T",
    "name" : "VkBuffer_T *const",
-   "referenced_type" : "_ZTIP10VkBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP10VkBuffer_T",
    "self_type" : "_ZTIKP10VkBuffer_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -19739,86 +18890,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP11VkSampler_T",
    "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
-   "referenced_type" : "_ZTIP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP11VkSampler_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP11VkSampler_T",
-   "name" : "VkSampler_T *const",
    "referenced_type" : "_ZTIP11VkSampler_T",
    "self_type" : "_ZTIKP11VkSampler_T",
    "size" : 8,
@@ -19829,86 +18900,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP13VkImageView_T",
    "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
-   "referenced_type" : "_ZTIP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP13VkImageView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkImageView_T",
-   "name" : "VkImageView_T *const",
    "referenced_type" : "_ZTIP13VkImageView_T",
    "self_type" : "_ZTIKP13VkImageView_T",
    "size" : 8,
@@ -19919,86 +18910,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP13VkSemaphore_T",
    "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
-   "referenced_type" : "_ZTIP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP13VkSemaphore_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP13VkSemaphore_T",
-   "name" : "VkSemaphore_T *const",
    "referenced_type" : "_ZTIP13VkSemaphore_T",
    "self_type" : "_ZTIKP13VkSemaphore_T",
    "size" : 8,
@@ -20009,86 +18920,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP14VkBufferView_T",
    "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
-   "referenced_type" : "_ZTIP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP14VkBufferView_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP14VkBufferView_T",
-   "name" : "VkBufferView_T *const",
    "referenced_type" : "_ZTIP14VkBufferView_T",
    "self_type" : "_ZTIKP14VkBufferView_T",
    "size" : 8,
@@ -20099,86 +18930,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
    "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
-   "referenced_type" : "_ZTIP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP16VkSwapchainKHR_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP16VkSwapchainKHR_T",
-   "name" : "VkSwapchainKHR_T *const",
    "referenced_type" : "_ZTIP16VkSwapchainKHR_T",
    "self_type" : "_ZTIKP16VkSwapchainKHR_T",
    "size" : 8,
@@ -20189,86 +18940,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 8,
@@ -20279,7 +18950,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkDescriptorSet_T",
    "name" : "VkDescriptorSet_T *const",
-   "referenced_type" : "_ZTIP17VkDescriptorSet_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkDescriptorSet_T",
    "self_type" : "_ZTIKP17VkDescriptorSet_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -20289,16 +18960,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkPipelineCache_T",
    "name" : "VkPipelineCache_T *const",
-   "referenced_type" : "_ZTIP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkPipelineCache_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkPipelineCache_T",
-   "name" : "VkPipelineCache_T *const",
    "referenced_type" : "_ZTIP17VkPipelineCache_T",
    "self_type" : "_ZTIKP17VkPipelineCache_T",
    "size" : 8,
@@ -20309,86 +18970,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 8,
@@ -20399,86 +18980,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
    "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
-   "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP23VkDescriptorSetLayout_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP23VkDescriptorSetLayout_T",
-   "name" : "VkDescriptorSetLayout_T *const",
    "referenced_type" : "_ZTIP23VkDescriptorSetLayout_T",
    "self_type" : "_ZTIKP23VkDescriptorSetLayout_T",
    "size" : 8,
@@ -20489,86 +18990,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
    "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
-   "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP27VkAccelerationStructureNV_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP27VkAccelerationStructureNV_T",
-   "name" : "VkAccelerationStructureNV_T *const",
    "referenced_type" : "_ZTIP27VkAccelerationStructureNV_T",
    "self_type" : "_ZTIKP27VkAccelerationStructureNV_T",
    "size" : 8,
@@ -20579,16 +19000,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP9VkEvent_T",
    "name" : "VkEvent_T *const",
-   "referenced_type" : "_ZTIP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP9VkEvent_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 8,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP9VkEvent_T",
-   "name" : "VkEvent_T *const",
    "referenced_type" : "_ZTIP9VkEvent_T",
    "self_type" : "_ZTIKP9VkEvent_T",
    "size" : 8,
@@ -20599,7 +19010,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP9VkFence_T",
    "name" : "VkFence_T *const",
-   "referenced_type" : "_ZTIP9VkFence_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP9VkFence_T",
    "self_type" : "_ZTIKP9VkFence_T",
    "size" : 8,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
diff --git a/30/64/x86_64/source-based/libz.so.lsdump b/30/64/x86_64/source-based/libz.so.lsdump
index 8b6ae7d..b7909fc 100644
--- a/30/64/x86_64/source-based/libz.so.lsdump
+++ b/30/64/x86_64/source-based/libz.so.lsdump
@@ -2248,33 +2248,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_64_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_64_static/obj/external/zlib/crc32.sdump",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_64_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_64_static/obj/external/zlib/deflate.sdump",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_64_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_64_static/obj/external/zlib/trees.sdump",
-   "size" : 8,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",
diff --git a/30/64/x86_x86_64/source-based/libEGL.so.lsdump b/30/64/x86_x86_64/source-based/libEGL.so.lsdump
index c784ee9..65f60d5 100644
--- a/30/64/x86_x86_64/source-based/libEGL.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libEGL.so.lsdump
@@ -2020,15 +2020,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
diff --git a/30/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump b/30/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
index e2cca8f..5e12edb 100644
--- a/30/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
@@ -5891,10 +5891,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26105,24 +26105,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26321,15 +26303,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26339,15 +26312,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26357,15 +26321,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26438,15 +26393,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26456,15 +26402,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26474,15 +26411,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26492,15 +26420,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26510,15 +26429,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26528,15 +26438,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_x86_64_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36512,6 +36413,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38055,14 +37965,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38079,14 +37981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38103,14 +37997,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38119,14 +38005,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38143,14 +38021,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38159,14 +38029,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38175,14 +38037,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38199,14 +38053,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38215,14 +38061,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38239,14 +38077,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39546,7 +39376,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39600,13 +39430,13 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android11AudioRecordE",
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41390,16 +41220,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenMAXAL/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/xa_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43233,11 +43053,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52882,8 +52697,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -52892,7 +52713,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54431,7 +54252,7 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -54700,74 +54521,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4000,
+     "field_offset" : 4896,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4384,
+     "field_offset" : 5280,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5376,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54776,7 +54621,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55158,6 +55003,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57741,6 +57640,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57780,6 +57683,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67682,6 +67589,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67721,6 +67632,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68772,6 +68687,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68811,6 +68730,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76688,7 +76611,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_x86_64/source-based/libOpenSLES.so.lsdump b/30/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
index 83500cd..e077b14 100644
--- a/30/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
@@ -5927,10 +5927,10 @@
      "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
     }
    ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
    "underlying_type" : "_ZTIj"
@@ -26213,24 +26213,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/assert.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android10AudioGainsE",
    "name" : "const android::AudioGains &",
    "referenced_type" : "_ZTIKN7android10AudioGainsE",
@@ -26429,15 +26411,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android2wpINS_7IBinderEEE",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "_ZTIKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android2wpINS_7IBinderEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
    "name" : "const android::media::VolumeShaper::Configuration &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE",
@@ -26447,15 +26420,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE",
-   "name" : "const android::media::VolumeShaper::Configuration &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper13ConfigurationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
    "name" : "const android::media::VolumeShaper::Operation &",
    "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE",
@@ -26465,15 +26429,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android5media12VolumeShaper9OperationE",
-   "name" : "const android::media::VolumeShaper::Operation &",
-   "referenced_type" : "_ZTIKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKN7android5media12VolumeShaper9OperationE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_x86_64_shared/gen/aidl/android/media/IPlayer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android6ParcelE",
    "name" : "const android::Parcel &",
    "referenced_type" : "_ZTIKN7android6ParcelE",
@@ -26546,15 +26501,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/convert.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
    "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
    "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
@@ -26564,15 +26510,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE",
-   "name" : "const std::set<unsigned int, std::less<unsigned int>, std::allocator<unsigned int> > &",
-   "referenced_type" : "_ZTIKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__13setIjNS_4lessIjEENS_9allocatorIjEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudiofoundation/include/media/AudioProfile.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
@@ -26582,15 +26519,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_attributes_t, std::allocator<audio_attributes_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI18audio_attributes_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
    "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
@@ -26600,15 +26528,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE",
-   "name" : "const std::vector<audio_stream_type_t, std::allocator<audio_stream_type_t> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorI19audio_stream_type_tNS_9allocatorIS1_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioVolumeGroup.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
    "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
@@ -26618,15 +26537,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE",
-   "name" : "const std::vector<android::AudioAttributes, std::allocator<android::AudioAttributes> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIN7android15AudioAttributesENS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioProductStrategy.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -26636,15 +26546,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/frameworks/av/media/libaudioclient/libaudioclient/android_x86_x86_64_shared/gen/aidl/android/media/IAudioTrackCallback.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKa",
    "name" : "const signed char &",
    "referenced_type" : "_ZTIKa",
@@ -36620,6 +36521,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener *",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIPN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11AudioSystem24AudioPolicyServiceClientE",
    "name" : "android::AudioSystem::AudioPolicyServiceClient *",
    "referenced_type" : "_ZTIN7android11AudioSystem24AudioPolicyServiceClientE",
@@ -38163,14 +38073,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_mode_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI12audio_mode_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38187,14 +38089,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_format_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI14audio_format_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38211,14 +38105,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_input_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_input_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38227,14 +38113,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_stream_type_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI19audio_stream_type_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38251,14 +38129,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<audio_output_flags_t> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsI20audio_output_flags_tEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38267,14 +38137,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
-   "name" : "android::TypeConverter<android::DefaultTraits<unsigned int> >::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_13DefaultTraitsIjEEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38283,14 +38145,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::AudioFlagTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_15AudioFlagTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38307,14 +38161,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::ChannelIndexTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18ChannelIndexTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38323,14 +38169,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::InputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_18InputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -38347,14 +38185,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
-   "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
-   "name" : "android::TypeConverter<android::OutputChannelTraits>::Table const[]",
    "referenced_type" : "_ZTIA_N7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "self_type" : "_ZTIA_KN7android13TypeConverterINS_19OutputChannelTraitsEE5TableE",
    "source_file" : "/frameworks/av/media/libmediahelper/include/media/TypeConverter.h"
@@ -39654,7 +39484,7 @@
    "name" : "const android::AudioTrack",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIKN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h"
   },
   {
@@ -39708,13 +39538,13 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioEffect.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android11AudioRecordE",
    "name" : "const android::AudioRecord",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIKN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
@@ -41498,16 +41328,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/wilhelm/src/libOpenSLES/android_x86_x86_64_shared/obj/frameworks/wilhelm/src/sl_iid.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -43341,11 +43161,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -52990,8 +52805,14 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAudioTrackCallback",
+     "field_name" : "mCallerName",
      "field_offset" : 6816,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAudioTrackCallback",
+     "field_offset" : 6912,
      "referenced_type" : "_ZTIN7android2spINS_10AudioTrack18AudioTrackCallbackEEE"
     }
    ],
@@ -53000,7 +52821,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10AudioTrackE",
    "self_type" : "_ZTIN7android10AudioTrackE",
-   "size" : 856,
+   "size" : 872,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioTrack.h",
    "vtable_components" :
    [
@@ -54539,7 +54360,7 @@
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -54808,74 +54629,98 @@
     },
     {
      "access" : "private",
+     "field_name" : "mPreviousTimestamp",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIN7android17ExtendedTimestampE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradePositionReported",
+     "field_offset" : 2368,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampRetrogradeTimeReported",
+     "field_offset" : 2376,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mDeathNotifier",
-     "field_offset" : 1504,
+     "field_offset" : 2400,
      "referenced_type" : "_ZTIN7android2spINS_11AudioRecord13DeathNotifierEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSequence",
-     "field_offset" : 1536,
+     "field_offset" : 2432,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientUid",
-     "field_offset" : 1568,
+     "field_offset" : 2464,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mClientPid",
-     "field_offset" : 1600,
+     "field_offset" : 2496,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mAttributes",
-     "field_offset" : 1632,
+     "field_offset" : 2528,
      "referenced_type" : "_ZTI18audio_attributes_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedDeviceId",
-     "field_offset" : 3808,
+     "field_offset" : 4704,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mRoutedDeviceId",
-     "field_offset" : 3840,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceCallback",
-     "field_offset" : 3872,
+     "field_offset" : 4768,
      "referenced_type" : "_ZTIN7android2wpINS_11AudioSystem19AudioDeviceCallbackEEE"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicDirection",
-     "field_offset" : 3936,
+     "field_offset" : 4832,
      "referenced_type" : "_ZTI28audio_microphone_direction_t"
     },
     {
      "access" : "private",
      "field_name" : "mSelectedMicFieldDimension",
-     "field_offset" : 3968,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIf"
     },
     {
      "access" : "private",
      "field_name" : "mMediaMetrics",
-     "field_offset" : 4000,
+     "field_offset" : 4896,
      "referenced_type" : "_ZTIN7android11AudioRecord12MediaMetricsE"
     },
     {
      "access" : "private",
      "field_name" : "mMetricsId",
-     "field_offset" : 4384,
+     "field_offset" : 5280,
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallerName",
+     "field_offset" : 5376,
      "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
     }
    ],
@@ -54884,7 +54729,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android11AudioRecordE",
    "self_type" : "_ZTIN7android11AudioRecordE",
-   "size" : 560,
+   "size" : 688,
    "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioRecord.h",
    "vtable_components" :
    [
@@ -55266,6 +55111,60 @@
    ]
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN7android7RefBaseE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "name" : "android::AudioSystem::CaptureStateListener",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "self_type" : "_ZTIN7android11AudioSystem20CaptureStateListenerE",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaudioclient/include/media/AudioSystem.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11AudioSystem20CaptureStateListenerE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListenerD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener14onStateChangedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android11AudioSystem20CaptureStateListener13onServiceDiedEv"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "base_specifiers" :
@@ -57849,6 +57748,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -57888,6 +57791,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -67790,6 +67697,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -67829,6 +67740,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -68880,6 +68795,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService16setCurrentImeUidEj"
+    },
+    {
+     "is_pure" : true,
      "mangled_component_name" : "_ZN7android19IAudioPolicyService25isHapticPlaybackSupportedEv"
     },
     {
@@ -68919,6 +68838,10 @@
      "mangled_component_name" : "_ZN7android19IAudioPolicyService29getPreferredDeviceForStrategyENS_18product_strategy_tERNS_19AudioDeviceTypeAddrE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android19IAudioPolicyService40registerSoundTriggerCaptureStateListenerERKNS_2spINS_5media21ICaptureStateListenerEEEPb"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_19IAudioPolicyServiceEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -76796,7 +76719,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_x86_64/source-based/libaaudio.so.lsdump b/30/64/x86_x86_64/source-based/libaaudio.so.lsdump
index 812a083..e724293 100644
--- a/30/64/x86_x86_64/source-based/libaaudio.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libaaudio.so.lsdump
@@ -442,7 +442,7 @@
     }
    ],
    "linker_set_key" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:461:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:462:1)",
    "referenced_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "self_type" : "_ZTI27$AAUDIO_SESSION_ID_ALLOCATE",
    "size" : 4,
@@ -536,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:422:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:423:1)",
    "referenced_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "self_type" : "_ZTI28$AAUDIO_ALLOW_CAPTURE_BY_ALL",
    "size" : 4,
@@ -615,7 +615,7 @@
     }
    ],
    "linker_set_key" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
-   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:813:1)",
+   "name" : "(anonymous enum at frameworks/av/media/libaaudio/include/aaudio/AAudio.h:814:1)",
    "referenced_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "self_type" : "_ZTI32$AAUDIO_CALLBACK_RESULT_CONTINUE",
    "size" : 4,
diff --git a/30/64/x86_x86_64/source-based/libandroid.so.lsdump b/30/64/x86_x86_64/source-based/libandroid.so.lsdump
index add11df..9df9e28 100644
--- a/30/64/x86_x86_64/source-based/libandroid.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libandroid.so.lsdump
@@ -1900,6 +1900,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1955,27 +1976,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -2286,7 +2286,7 @@
      "referenced_type" : "_ZTIPK15AHardwareBuffer"
     }
    ],
-   "return_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
+   "return_type" : "_ZTIPK13native_handle",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
   },
   {
@@ -2752,51 +2752,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:",
-   "self_type" : "_ZTIPK13native_handle#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_x86_64_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_x86_64_shared/obj/frameworks/base/native/android/native_window_jni.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_x86_64_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/base/native/android/libandroid/android_x86_x86_64_shared/obj/frameworks/base/native/android/surface_control.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/AHardwareBuffer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2989,7 +2944,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump b/30/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
index 95fa5bd..998e22e 100644
--- a/30/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
@@ -3143,7 +3143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -3743,7 +3743,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6262,7 +6262,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6376,7 +6376,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6388,7 +6388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6460,7 +6460,7 @@
      "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIP8_jobject",
@@ -6514,7 +6514,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
    "return_type" : "_ZTIv",
@@ -6532,7 +6532,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel_jni.sdump",
+   "return_type" : "_ZTIP7AParcel",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h"
   },
   {
@@ -6541,7 +6541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIb",
@@ -6553,7 +6553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6565,7 +6565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPb"
@@ -6580,7 +6580,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6601,7 +6601,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPa"
@@ -6616,7 +6616,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6634,7 +6634,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPDs"
@@ -6649,7 +6649,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6667,7 +6667,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPd"
@@ -6682,7 +6682,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6700,7 +6700,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -6715,7 +6715,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6733,7 +6733,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6748,7 +6748,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6766,7 +6766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPx"
@@ -6781,7 +6781,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6799,7 +6799,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -6814,7 +6814,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6835,7 +6835,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPP7AStatus"
@@ -6850,7 +6850,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6868,7 +6868,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6889,10 +6889,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -6904,7 +6904,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -6919,7 +6919,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6937,7 +6937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPy"
@@ -6952,7 +6952,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -6970,7 +6970,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -6985,7 +6985,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -7000,7 +7000,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7021,7 +7021,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIa"
@@ -7036,7 +7036,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKa"
@@ -7054,7 +7054,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIDs"
@@ -7069,7 +7069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKDs"
@@ -7087,7 +7087,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTId"
@@ -7102,7 +7102,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKd"
@@ -7120,7 +7120,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -7135,7 +7135,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -7153,7 +7153,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7168,7 +7168,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKi"
@@ -7186,7 +7186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIx"
@@ -7201,7 +7201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKx"
@@ -7219,7 +7219,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -7234,7 +7234,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7255,7 +7255,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPK7AStatus"
@@ -7270,7 +7270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7288,7 +7288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKv"
@@ -7309,10 +7309,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7324,7 +7324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7339,7 +7339,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKj"
@@ -7357,7 +7357,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -7372,7 +7372,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
+     "referenced_type" : "_ZTIP7AParcel"
     },
     {
      "referenced_type" : "_ZTIPKy"
@@ -7390,7 +7390,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -7408,7 +7408,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7420,7 +7420,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7429,7 +7429,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIP7AStatus"
     }
    ],
    "return_type" : "_ZTIv",
@@ -7456,7 +7456,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7471,7 +7471,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7483,7 +7483,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7498,7 +7498,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7510,7 +7510,7 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7519,7 +7519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7531,7 +7531,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7543,7 +7543,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -7555,7 +7555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7567,7 +7567,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIi",
@@ -7579,7 +7579,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
    "return_type" : "_ZTIb",
@@ -7588,7 +7588,7 @@
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "return_type" : "_ZTIP7AStatus",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -9974,15 +9974,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK14AIBinder_Class",
-   "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
    "referenced_type" : "_ZTIK15JNINativeMethod",
@@ -10028,24 +10019,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
    "referenced_type" : "_ZTIK7AStatus",
@@ -10055,24 +10028,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
    "referenced_type" : "_ZTIK8AIBinder",
@@ -10082,15 +10037,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8AIBinder",
-   "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
    "referenced_type" : "_ZTIKDs",
@@ -10217,15 +10163,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AParcel",
-   "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
    "referenced_type" : "_ZTIP7AStatus",
@@ -10235,15 +10172,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP7AStatus",
-   "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
    "referenced_type" : "_ZTIP7_JNIEnv",
@@ -10271,24 +10199,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
    "referenced_type" : "_ZTIPDs",
diff --git a/30/64/x86_x86_64/source-based/libc.so.lsdump b/30/64/x86_x86_64/source-based/libc.so.lsdump
index 86eafa0..018114f 100644
--- a/30/64/x86_x86_64/source-based/libc.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libc.so.lsdump
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/mbstate_t.h"
+   "source_file" : "/bionic/libc/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -6665,7 +6665,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -6689,7 +6689,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -6713,7 +6713,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -7280,7 +7280,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPK10sigset64_t"
@@ -7304,7 +7304,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump"
+     "referenced_type" : "_ZTIPK8timespec"
     },
     {
      "referenced_type" : "_ZTIPKm"
@@ -8123,7 +8123,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetln.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -8138,7 +8138,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8156,7 +8156,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fgetws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIPi",
@@ -8192,7 +8192,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fpurge.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8207,7 +8207,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -8222,7 +8222,7 @@
      "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fputws.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -8273,7 +8273,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/fwide.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -8342,7 +8342,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/getdelim.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9266,7 +9266,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -9551,7 +9551,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_memstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
@@ -9566,7 +9566,7 @@
      "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/open_wmemstream.sdump",
+   "return_type" : "_ZTIP7__sFILE",
    "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
@@ -11417,7 +11417,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/setvbuf.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -11654,7 +11654,7 @@
      "referenced_type" : "_ZTIP2tm"
     },
     {
-     "referenced_type" : "_ZTIP10__locale_t#ODR:out/soong/.intermediates/bionic/libc/libc_tzcode/android_x86_x86_64_static/obj/bionic/libc/tzcode/strptime.sdump"
+     "referenced_type" : "_ZTIP10__locale_t"
     }
    ],
    "return_type" : "_ZTIPc",
@@ -11915,7 +11915,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIi",
@@ -11930,7 +11930,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP7__sFILE#ODR:out/soong/.intermediates/bionic/libc/libc_openbsd_ndk/android_x86_x86_64_static/obj/bionic/libc/upstream-openbsd/lib/libc/stdio/ungetwc.sdump"
+     "referenced_type" : "_ZTIP7__sFILE"
     }
    ],
    "return_type" : "_ZTIj",
@@ -13251,7 +13251,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIP8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -13480,366 +13480,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/android_profiling_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/gwp_asan_wrappers.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/heap_tagging.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_common_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_heapprofd.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/malloc_limit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc/android_x86_x86_64_shared/obj/shared_library/bionic/libc/bionic/ndk_cruft.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_x86_64_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_x86_64_static/obj/bionic/libc/bionic/android_set_abort_message.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_x86_64_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_x86_64_static/obj/bionic/libc/bionic/setjmp_cookie.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_x86_64_static/obj/bionic/libc/bionic/vdso.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bionic/android_x86_x86_64_static/obj/bionic/libc/bionic/vdso.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/arch-x86/bionic/__libc_init_sysinfo.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/arch-x86/bionic/__libc_init_sysinfo.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/bionic_call_ifunc_resolver.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/getauxval.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_x86_64_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_init_dynamic/android_x86_x86_64_static/obj/bionic/libc/bionic/libc_init_dynamic.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/__cxa_thread_atexit_impl.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/android_unsafe_frame_pointer_chase.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/bionic_elf_tls.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/fork.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/fork.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_attr.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_cond.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_create.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_detach.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_exit.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_getcpuclockid.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_getschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_gettid_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_internal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_join.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_key.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_kill.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_mutex.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_rwlock.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_self.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_setname_np.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_setschedparam.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libc/libc_pthread/android_x86_x86_64_static/obj/bionic/libc/bionic/pthread_sigqueue.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK10elf32_phdr",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "_ZTIK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_x86_64_static/obj/bionic/libdl/libdl_android.sdump",
-   "self_type" : "_ZTIPK10elf32_phdr#ODR:out/soong/.intermediates/bionic/libdl/libdl_android/android_x86_x86_64_static/obj/bionic/libdl/libdl_android.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK10sigset64_t",
    "name" : "const sigset64_t *",
    "referenced_type" : "_ZTIK10sigset64_t",
@@ -13881,7 +13521,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -13930,24 +13570,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:",
-   "self_type" : "_ZTIPK7siginfo#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7siginfo",
-   "name" : "const siginfo *",
-   "referenced_type" : "_ZTIK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "self_type" : "_ZTIPK7siginfo#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/psignal.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7utimbuf",
    "name" : "const utimbuf *",
    "referenced_type" : "_ZTIK7utimbuf",
@@ -13957,24 +13579,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:",
-   "self_type" : "_ZTIPK7utimbuf#ODR:",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7utimbuf",
-   "name" : "const utimbuf *",
-   "referenced_type" : "_ZTIK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "self_type" : "_ZTIPK7utimbuf#ODR:out/soong/.intermediates/bionic/libc/libc_netbsd/android_x86_x86_64_static/obj/bionic/libc/upstream-netbsd/lib/libc/gen/utime.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/utime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8__ns_msg",
    "name" : "const __ns_msg *",
    "referenced_type" : "_ZTIK8__ns_msg",
@@ -13998,7 +13602,7 @@
    "referenced_type" : "_ZTIK8sockaddr",
    "self_type" : "_ZTIPK8sockaddr",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14007,28 +13611,10 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIPK8timespec",
    "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/libc_fortify/android_x86_x86_64_static/obj/bionic/libc/bionic/fortify.sdump",
-   "size" : 4,
    "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK8timespec",
-   "name" : "const timespec *",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_x86_64_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "self_type" : "_ZTIPK8timespec#ODR:out/soong/.intermediates/bionic/libc/system_properties/libsystemproperties/android_x86_x86_64_static/obj/bionic/libc/system_properties/system_properties.sdump",
-   "size" : 4,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK9prop_area",
    "name" : "const prop_area *",
    "referenced_type" : "_ZTIK9prop_area",
@@ -14115,7 +13701,7 @@
    "referenced_type" : "_ZTIKPc",
    "self_type" : "_ZTIPKPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/getopt.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14133,7 +13719,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -14169,7 +13755,7 @@
    "referenced_type" : "_ZTIKl",
    "self_type" : "_ZTIPKl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -14295,7 +13881,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/stdlib.h"
+   "source_file" : "/bionic/libc/include/search.h"
   },
   {
    "alignment" : 4,
@@ -14322,7 +13908,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/bits/getopt.h"
   },
   {
    "alignment" : 4,
@@ -14358,7 +13944,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIPl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -14395,96 +13981,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA65_KPKc",
    "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_bootstrap/android_x86_x86_64_static/obj/bionic/libc/bionic/__libc_init_main_thread.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/nameser/ns_parse.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/net/gethnamaddr.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/net/getnameinfo.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/net/sethostent.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/resolv/res_mkquery.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/resolv/res_state.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/bionic/libc/libc_dns/android_x86_x86_64_static/obj/bionic/libc/dns/resolv/res_stats.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
-   "referenced_type" : "_ZTIA65_PKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_x86_64_static/obj/external/scudo/standalone/linux.sdump",
-   "self_type" : "_ZTIA65_KPKc#ODR:out/soong/.intermediates/external/scudo/libscudo/android_x86_x86_64_static/obj/external/scudo/standalone/linux.sdump",
-   "size" : 260,
-   "source_file" : "/bionic/libc/include/signal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA65_KPKc",
-   "name" : "const char *const[65]",
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
@@ -14548,7 +14044,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/wchar.h"
   },
   {
    "alignment" : 4,
@@ -14668,7 +14164,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTIK8sockaddr",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/netdb.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/socket.h"
   },
   {
    "alignment" : 4,
@@ -14678,7 +14174,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
+   "source_file" : "/bionic/libc/include/bits/fortify/poll.h"
   },
   {
    "alignment" : 4,
@@ -14806,7 +14302,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/string.h"
+   "source_file" : "/bionic/libc/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -14836,7 +14332,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -14856,7 +14352,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/wchar.h"
+   "source_file" : "/bionic/libc/system_properties/include/system_properties/system_properties.h"
   },
   {
    "alignment" : 4,
@@ -14876,7 +14372,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIKl",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/time.h"
+   "source_file" : "/bionic/libc/include/pthread.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/x86_x86_64/source-based/libcamera2ndk.so.lsdump b/30/64/x86_x86_64/source-based/libcamera2ndk.so.lsdump
index 09511dc..0610d5e 100644
--- a/30/64/x86_x86_64/source-based/libcamera2ndk.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libcamera2ndk.so.lsdump
@@ -2593,6 +2593,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "ACAMERA_EDGE_MODE_OFF"
     },
     {
@@ -3127,27 +3148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "ACAMERA_CONTROL_AWB_STATE_INACTIVE"
     },
     {
@@ -4887,7 +4887,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4899,7 +4899,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -4908,7 +4908,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4923,7 +4923,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTIv",
@@ -4935,10 +4935,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -4950,7 +4950,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4959,7 +4959,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4974,7 +4974,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP52ACameraCaptureSession_logicalCamera_captureCallbacks"
@@ -4983,7 +4983,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -4998,7 +4998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
      "referenced_type" : "_ZTIP38ACameraCaptureSession_captureCallbacks"
@@ -5007,7 +5007,7 @@
      "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIPP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5022,7 +5022,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5034,10 +5034,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACameraCaptureSession"
     },
     {
-     "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump"
+     "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5049,7 +5049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5100,7 +5100,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
@@ -5121,13 +5121,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ACameraDevice"
     },
     {
      "referenced_type" : "_ZTIPK30ACaptureSessionOutputContainer"
     },
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK36ACameraCaptureSession_stateCallbacks"
@@ -5316,10 +5316,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5328,7 +5328,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIP15ACameraMetadata"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5346,7 +5346,7 @@
      "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
+   "return_type" : "_ZTIP15ACameraMetadata",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
   },
   {
@@ -5355,7 +5355,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5373,7 +5373,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5391,7 +5391,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump"
+     "referenced_type" : "_ZTIPK15ACameraMetadata"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -5409,7 +5409,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP19ACameraOutputTarget"
@@ -5436,7 +5436,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5451,10 +5451,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     }
    ],
-   "return_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
+   "return_type" : "_ZTIP15ACaptureRequest",
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
   },
   {
@@ -5463,7 +5463,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     }
    ],
    "return_type" : "_ZTIv",
@@ -5475,7 +5475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPi"
@@ -5493,7 +5493,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5511,7 +5511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5532,7 +5532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIPK15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -5547,7 +5547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPK19ACameraOutputTarget"
@@ -5562,7 +5562,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5583,7 +5583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5604,7 +5604,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5625,7 +5625,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5646,7 +5646,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5670,7 +5670,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5694,7 +5694,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5718,7 +5718,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5742,7 +5742,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5766,7 +5766,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5790,7 +5790,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5811,7 +5811,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -5832,7 +5832,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump"
+     "referenced_type" : "_ZTIP15ACaptureRequest"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -5901,7 +5901,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5928,7 +5928,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -5949,7 +5949,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -5961,7 +5961,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     },
     {
      "referenced_type" : "_ZTIPP21ACaptureSessionOutput"
@@ -5979,7 +5979,7 @@
      "referenced_type" : "_ZTIP21ACaptureSessionOutput"
     },
     {
-     "referenced_type" : "_ZTIP13ANativeWindow#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump"
+     "referenced_type" : "_ZTIP13ANativeWindow"
     }
    ],
    "return_type" : "_ZTI15camera_status_t",
@@ -6388,15 +6388,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13ACameraDevice",
-   "name" : "const ACameraDevice *",
-   "referenced_type" : "_ZTIK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ACameraIdList",
    "name" : "const ACameraIdList *",
    "referenced_type" : "_ZTIK13ACameraIdList",
@@ -6424,60 +6415,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACameraMetadata",
    "name" : "const ACameraMetadata *",
    "referenced_type" : "_ZTIK15ACameraMetadata",
@@ -6487,69 +6424,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraMetadata.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACameraMetadata",
-   "name" : "const ACameraMetadata *",
-   "referenced_type" : "_ZTIK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15ACaptureRequest",
    "name" : "const ACaptureRequest *",
    "referenced_type" : "_ZTIK15ACaptureRequest",
@@ -6559,69 +6433,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15ACaptureRequest",
-   "name" : "const ACaptureRequest *",
-   "referenced_type" : "_ZTIK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPK15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
    "name" : "const ACameraOutputTarget *",
    "referenced_type" : "_ZTIK19ACameraOutputTarget",
@@ -6631,15 +6442,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK19ACameraOutputTarget",
-   "name" : "const ACameraOutputTarget *",
-   "referenced_type" : "_ZTIK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPK19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "_ZTIK19ANativeWindowBuffer",
@@ -6658,15 +6460,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ACaptureSessionOutput",
-   "name" : "const ACaptureSessionOutput *",
-   "referenced_type" : "_ZTIK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ACameraMetadata_rational",
    "name" : "const ACameraMetadata_rational *",
    "referenced_type" : "_ZTIK24ACameraMetadata_rational",
@@ -6685,15 +6478,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK30ACaptureSessionOutputContainer",
-   "name" : "const ACaptureSessionOutputContainer *",
-   "referenced_type" : "_ZTIK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPK30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK35ACameraManager_AvailabilityListener",
    "name" : "const ACameraManager_AvailabilityListener *",
    "referenced_type" : "_ZTIK35ACameraManager_AvailabilityListener",
@@ -6811,24 +6595,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP13ACameraDevice",
-   "name" : "ACameraDevice **",
-   "referenced_type" : "_ZTIP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP13ACameraDevice#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP13ACameraIdList",
    "name" : "ACameraIdList **",
    "referenced_type" : "_ZTIP13ACameraIdList",
@@ -6847,27 +6613,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACameraMetadata",
-   "name" : "ACameraMetadata **",
-   "referenced_type" : "_ZTIP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPP15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraManager.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15ACaptureRequest",
    "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP15ACaptureRequest",
-   "name" : "ACaptureRequest **",
-   "referenced_type" : "_ZTIP15ACaptureRequest#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP15ACaptureRequest",
    "self_type" : "_ZTIPP15ACaptureRequest",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6883,15 +6631,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP19ACameraOutputTarget",
-   "name" : "ACameraOutputTarget **",
-   "referenced_type" : "_ZTIP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "self_type" : "_ZTIPP19ACameraOutputTarget#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCaptureRequest.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCaptureRequest.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP19ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer **",
    "referenced_type" : "_ZTIP19ANativeWindowBuffer",
@@ -6903,7 +6642,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ACameraCaptureSession",
    "name" : "ACameraCaptureSession **",
-   "referenced_type" : "_ZTIP21ACameraCaptureSession#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
+   "referenced_type" : "_ZTIP21ACameraCaptureSession",
    "self_type" : "_ZTIPP21ACameraCaptureSession",
    "size" : 4,
    "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
@@ -6919,15 +6658,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ACaptureSessionOutput",
-   "name" : "ACaptureSessionOutput **",
-   "referenced_type" : "_ZTIP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP21ACaptureSessionOutput#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
    "name" : "ACaptureSessionOutputContainer **",
    "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer",
@@ -6937,15 +6667,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP30ACaptureSessionOutputContainer",
-   "name" : "ACaptureSessionOutputContainer **",
-   "referenced_type" : "_ZTIP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPP30ACaptureSessionOutputContainer#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraDevice.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK15ACameraMetadata",
    "name" : "const ACameraMetadata **",
    "referenced_type" : "_ZTIPK15ACameraMetadata",
@@ -6955,60 +6676,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/NdkCameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraCaptureSession.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraDevice.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPPK15ACameraMetadata",
-   "name" : "const ACameraMetadata **",
-   "referenced_type" : "_ZTIPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "self_type" : "_ZTIPPK15ACameraMetadata#ODR:out/soong/.intermediates/frameworks/av/camera/ndk/libcamera2ndk/android_x86_x86_64_shared/obj/frameworks/av/camera/ndk/impl/ACameraManager.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/camera/ndk/include/camera/NdkCameraCaptureSession.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKPKc",
    "name" : "const char *const **",
    "referenced_type" : "_ZTIPKPKc",
diff --git a/30/64/x86_x86_64/source-based/libjnigraphics.so.lsdump b/30/64/x86_x86_64/source-based/libjnigraphics.so.lsdump
index 07bae75..cd21c79 100644
--- a/30/64/x86_x86_64/source-based/libjnigraphics.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libjnigraphics.so.lsdump
@@ -8870,7 +8870,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump"
+     "referenced_type" : "_ZTIP6AAsset"
     },
     {
      "referenced_type" : "_ZTIPP13AImageDecoder"
@@ -9517,15 +9517,6 @@
    "source_file" : "/external/libcxx/include/stdexcept"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
-   "size" : 4,
-   "source_file" : "/external/libcxx/include/stdexcept"
-  },
-  {
    "linker_set_key" : "_ZTIRKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
    "name" : "const __bit_iterator<_Cp, _IsConst, > &",
    "referenced_type" : "_ZTIKNSt3__114__bit_iteratorIT_XT0_EXT1_EEE",
@@ -10522,7 +10513,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AAsset",
    "name" : "AAsset *&",
-   "referenced_type" : "_ZTIP6AAsset#ODR:out/soong/.intermediates/frameworks/base/native/graphics/jni/libjnigraphics/android_x86_x86_64_shared/obj/frameworks/base/native/graphics/jni/imagedecoder.sdump",
+   "referenced_type" : "_ZTIP6AAsset",
    "self_type" : "_ZTIRP6AAsset",
    "size" : 4,
    "source_file" : "/external/libcxx/include/type_traits"
@@ -19059,11 +19050,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -25578,7 +25564,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_x86_64/source-based/libm.so.lsdump b/30/64/x86_x86_64/source-based/libm.so.lsdump
index add3925..6ac0e77 100644
--- a/30/64/x86_x86_64/source-based/libm.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libm.so.lsdump
@@ -152,7 +152,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA2_d",
    "size" : 16,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmod.c"
   },
   {
    "alignment" : 4,
@@ -242,7 +242,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA5_d",
    "size" : 40,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/external/arm-optimized-routines/math/math_config.h"
   },
   {
    "alignment" : 4,
@@ -251,7 +251,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIA5_f",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -278,7 +278,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIA6_d",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4125,7 +4125,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIPd",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/math_private.h"
+   "source_file" : "/bionic/libc/include/math.h"
   },
   {
    "alignment" : 4,
@@ -4242,7 +4242,7 @@
    "referenced_type" : "_ZTIA2_f",
    "self_type" : "_ZTIA2_Kf",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_fmodf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_remquof.c"
   },
   {
    "alignment" : 4,
@@ -4282,7 +4282,7 @@
    "referenced_type" : "_ZTIA5_f",
    "self_type" : "_ZTIA5_Kf",
    "size" : 20,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0f.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_atanf.c"
   },
   {
    "alignment" : 4,
@@ -4302,7 +4302,7 @@
    "referenced_type" : "_ZTIA6_d",
    "self_type" : "_ZTIA6_Kd",
    "size" : 48,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_j0.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_tanf.c"
   },
   {
    "alignment" : 4,
@@ -4440,7 +4440,7 @@
    "referenced_type" : "_ZTId",
    "self_type" : "_ZTIKd",
    "size" : 8,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/bsdsrc/b_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_asinf.c"
   },
   {
    "alignment" : 4,
@@ -4460,7 +4460,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrigf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acoshf.c"
   },
   {
    "alignment" : 4,
@@ -4470,7 +4470,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/k_exp.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_cexp.c"
   },
   {
    "alignment" : 2,
@@ -4502,7 +4502,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVKf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/catrig.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/s_erff.c"
   },
   {
    "alignment" : 4,
@@ -4512,7 +4512,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIVf",
    "size" : 4,
-   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_acosf.c"
+   "source_file" : "/bionic/libm/upstream-freebsd/lib/msun/src/e_atan2f.c"
   }
  ],
  "record_types" :
@@ -5450,7 +5450,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN20ieee_quad_shape_typeUt_E",
-   "name" : "ieee_quad_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:78:3)",
+   "name" : "ieee_quad_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:78:3)",
    "referenced_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "self_type" : "_ZTIN20ieee_quad_shape_typeUt_E",
    "size" : 16,
@@ -5472,7 +5472,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN22ieee_double_shape_typeUt_E",
-   "name" : "ieee_double_shape_type::(anonymous struct at /bionic/libm/upstream-freebsd/lib/msun/bsdsrc/../src/math_private.h:115:3)",
+   "name" : "ieee_double_shape_type::(anonymous struct at bionic/libm/upstream-freebsd/lib/msun/src/math_private.h:115:3)",
    "referenced_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "self_type" : "_ZTIN22ieee_double_shape_typeUt_E",
    "size" : 8,
diff --git a/30/64/x86_x86_64/source-based/libmediandk.so.lsdump b/30/64/x86_x86_64/source-based/libmediandk.so.lsdump
index 0058d3f..0040771 100644
--- a/30/64/x86_x86_64/source-based/libmediandk.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libmediandk.so.lsdump
@@ -347,11 +347,20 @@
    "name" : "android::Surface::BufferSlot [64]",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIA64_N7android7Surface10BufferSlotE",
-   "size" : 1536,
+   "size" : 5632,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "_ZTIA64_c",
+   "name" : "char [64]",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIA64_c",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "_ZTIA65_c",
    "name" : "char [65]",
    "referenced_type" : "_ZTIc",
@@ -7027,6 +7036,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 2,
      "name" : "AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG"
     },
@@ -7130,27 +7160,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 2,
      "name" : "FCC_2"
     },
@@ -7753,7 +7762,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:60:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:56:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "self_type" : "_ZTIN7android13GraphicBuffer13$USAGE_CURSORE",
    "size" : 4,
@@ -7808,7 +7817,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBuffer8$ownDataE",
-   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:236:5)",
+   "name" : "android::GraphicBuffer::(anonymous enum at frameworks/native/libs/ui/include/ui/GraphicBuffer.h:221:5)",
    "referenced_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "self_type" : "_ZTIN7android13GraphicBuffer8$ownDataE",
    "size" : 4,
@@ -19014,7 +19023,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19029,7 +19038,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19047,7 +19056,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19062,7 +19071,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP6AImage"
@@ -19080,7 +19089,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19152,7 +19161,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIPP13ANativeWindow"
@@ -19218,7 +19227,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP34AImageReader_BufferRemovedListener"
@@ -19233,7 +19242,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP12AImageReader"
     },
     {
      "referenced_type" : "_ZTIP26AImageReader_ImageListener"
@@ -20049,7 +20058,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump"
+     "referenced_type" : "_ZTIP12AMediaCrypto"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20082,7 +20091,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaCrypto#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
+   "return_type" : "_ZTIP12AMediaCrypto",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCrypto.h"
   },
   {
@@ -20775,7 +20784,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20799,7 +20808,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     }
    ],
-   "return_type" : "_ZTIP21AMediaCodecCryptoInfo#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP21AMediaCodecCryptoInfo",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20823,7 +20832,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -20889,7 +20898,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaExtractor.h"
   },
   {
@@ -20973,7 +20982,7 @@
      "referenced_type" : "_ZTIP15AMediaExtractor"
     },
     {
-     "referenced_type" : "_ZTIP16AMediaDataSource#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump"
+     "referenced_type" : "_ZTIP16AMediaDataSource"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21021,7 +21030,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21033,10 +21042,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21048,7 +21057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTI14media_status_t",
@@ -21060,7 +21069,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21081,7 +21090,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21099,7 +21108,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21117,7 +21126,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21135,7 +21144,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21153,7 +21162,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21180,7 +21189,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21198,7 +21207,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21213,7 +21222,7 @@
   {
    "function_name" : "AMediaFormat_new",
    "linker_set_key" : "AMediaFormat_new",
-   "return_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
+   "return_type" : "_ZTIP12AMediaFormat",
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaFormat.h"
   },
   {
@@ -21222,7 +21231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21243,7 +21252,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21261,7 +21270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21279,7 +21288,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21297,7 +21306,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21315,7 +21324,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21342,7 +21351,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21360,7 +21369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -21378,7 +21387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump"
+     "referenced_type" : "_ZTIP12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIPKc",
@@ -21393,7 +21402,7 @@
      "referenced_type" : "_ZTIP11AMediaMuxer"
     },
     {
-     "referenced_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump"
+     "referenced_type" : "_ZTIPK12AMediaFormat"
     }
    ],
    "return_type" : "_ZTIi",
@@ -22385,96 +22394,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkJavaVMHelper.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3ndk10SpAIBinderE",
    "name" : "const ndk::SpAIBinder &",
    "referenced_type" : "_ZTIKN3ndk10SpAIBinderE",
@@ -22520,42 +22439,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android13GrallocMapperE",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "_ZTIKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android13GrallocMapperE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android16key_value_pair_tINS_7String8ES1_EE",
    "name" : "const android::key_value_pair_t<android::String8, android::String8> &",
    "referenced_type" : "_ZTIKN7android16key_value_pair_tINS_7String8ES1_EE",
@@ -22885,7 +22768,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIRKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -23102,41 +22985,6 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vec4iterIXTL0__EEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
@@ -23219,51 +23067,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE",
@@ -23273,15 +23076,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE",
-   "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIhNS_9allocatorIhEEEE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKP6AImage",
    "name" : "AImage *const &",
    "referenced_type" : "_ZTIKP6AImage",
@@ -23471,6 +23265,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation &",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIRN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -23914,7 +23717,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRP6AImage",
    "name" : "AImage *&",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIRP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -27281,24 +27084,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaCodec.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12AMediaFormat",
-   "name" : "const AMediaFormat *",
-   "referenced_type" : "_ZTIK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIPK12AMediaFormat#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/ndk/include/media/NdkMediaMuxer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK13ANativeWindow",
    "name" : "const ANativeWindow *",
    "referenced_type" : "_ZTIK13ANativeWindow",
@@ -27524,42 +27309,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_interface_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7log_msg",
    "name" : "const log_msg *",
    "referenced_type" : "_ZTIK7log_msg",
@@ -28393,7 +28142,7 @@
    "referenced_type" : "_ZTIKN7android4RectE",
    "self_type" : "_ZTIPKN7android4RectE",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -28496,15 +28245,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIPKN7android6VectorINS_4RectEEE",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char> *",
    "referenced_type" : "_ZTIKN7android6VectorIhEE",
@@ -28541,24 +28281,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8AHandlerE",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "_ZTIKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPKN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android8String16E",
    "name" : "const android::String16 *",
    "referenced_type" : "_ZTIKN7android8String16E",
@@ -31198,7 +30920,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP12AImageReader",
    "name" : "AImageReader **",
-   "referenced_type" : "_ZTIP12AImageReader#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP12AImageReader",
    "self_type" : "_ZTIPP12AImageReader",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31252,7 +30974,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP6AImage",
    "name" : "AImage **",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIPP6AImage",
    "size" : 4,
    "source_file" : "/frameworks/av/media/ndk/include/media/NdkImageReader.h"
@@ -31286,42 +31008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPK13native_handle",
    "name" : "const native_handle **",
    "referenced_type" : "_ZTIPK13native_handle",
@@ -32111,7 +31797,7 @@
    "name" : "const android::BufferItem",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIKN7android10BufferItemE",
-   "size" : 164,
+   "size" : 228,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -32279,7 +31965,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -32369,7 +32055,7 @@
    "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIKN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -33020,7 +32706,7 @@
    "referenced_type" : "_ZTIN7android4RectE",
    "self_type" : "_ZTIKN7android4RectE",
    "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "alignment" : 4,
@@ -33129,7 +32815,7 @@
    "name" : "const android::Region",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIKN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -33155,16 +32841,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIKN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android6VectorIhEE",
    "name" : "const android::Vector<unsigned char>",
    "referenced_type" : "_ZTIN7android6VectorIhEE",
@@ -34135,7 +33811,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP6AImage",
    "name" : "AImage *const",
-   "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
+   "referenced_type" : "_ZTIP6AImage",
    "self_type" : "_ZTIKP6AImage",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
@@ -34145,46 +33821,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP7AStatus",
    "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
-   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKP7AStatus#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_auto_utils.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP7AStatus",
-   "name" : "AStatus *const",
    "referenced_type" : "_ZTIP7AStatus",
    "self_type" : "_ZTIKP7AStatus",
    "size" : 4,
@@ -34245,96 +33881,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImage.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCodec.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaCrypto.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDataSource.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaDrm.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaExtractor.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaFormat.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "self_type" : "_ZTIKPN7android7RefBase12weakref_implE#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkMediaMuxer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPN7android7RefBase12weakref_implE",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "_ZTIPN7android7RefBase12weakref_implE",
    "self_type" : "_ZTIKPN7android7RefBase12weakref_implE",
    "size" : 4,
@@ -35075,11 +34621,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -39768,38 +39309,6 @@
    "fields" :
    [
     {
-     "field_name" : "left",
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "name" : "aidl::android::hardware::graphics::common::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "self_type" : "_ZTIN4aidl7android8hardware8graphics6common4RectE",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/aidl/android.hardware.graphics.common-ndk_platform-source/gen/include/aidl/android/hardware/graphics/common/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "x",
      "referenced_type" : "_ZTIf"
     },
@@ -39972,22 +39481,22 @@
     },
     {
      "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
+     "field_offset" : 1760,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
+     "field_offset" : 1768,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mIsStale",
-     "field_offset" : 1264,
+     "field_offset" : 1776,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "mApi",
-     "field_offset" : 1280,
+     "field_offset" : 1792,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -39996,7 +39505,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android10BufferItemE",
    "self_type" : "_ZTIN7android10BufferItemE",
-   "size" : 164,
+   "size" : 228,
    "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
   },
   {
@@ -45283,27 +44792,15 @@
     },
     {
      "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1056,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "access" : "private",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 1088,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
-     "field_offset" : 1120,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1216,
-     "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15BufferHubBufferENS_14default_deleteIS2_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android13GraphicBufferE",
@@ -45311,7 +44808,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "vtable_components" :
    [
@@ -48148,6 +47645,45 @@
    ]
   },
   {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "array",
+     "referenced_type" : "_ZTIA64_c"
+    },
+    {
+     "field_name" : "inUse",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "name" : "android::InlineStdAllocator<Rect, 4>::Allocation",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE",
+   "size" : 65,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mAllocation",
+     "referenced_type" : "_ZTIRN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "name" : "android::InlineStdAllocator<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EEE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
    "alignment" : 4,
    "base_specifiers" :
    [
@@ -49947,12 +49483,12 @@
     },
     {
      "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTIb"
     },
     {
      "field_name" : "hdrMetadata",
-     "field_offset" : 576,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     }
    ],
@@ -49960,7 +49496,7 @@
    "name" : "android::IGraphicBufferProducer::QueueBufferInput",
    "referenced_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
    "self_type" : "_ZTIN7android22IGraphicBufferProducer16QueueBufferInputE",
-   "size" : 136,
+   "size" : 200,
    "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
   },
   {
@@ -52976,10 +52512,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "alignment" : 1,
@@ -52989,10 +52522,7 @@
    "self_type" : "_ZTIN7android4ListIP6AImageE18NON_CONST_ITERATORIS2_EE",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" :
-   [
-    "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
-   ]
+   "template_args" : [ "_ZTIP6AImage" ]
   },
   {
    "access" : "protected",
@@ -53002,7 +52532,7 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "_ZTIP6AImage#ODR:out/soong/.intermediates/frameworks/av/media/ndk/libmediandk/android_x86_x86_64_shared/obj/frameworks/av/media/ndk/NdkImageReader.sdump"
+     "referenced_type" : "_ZTIP6AImage"
     },
     {
      "access" : "private",
@@ -53960,7 +53490,7 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE"
+     "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android6RegionE",
@@ -53968,7 +53498,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android6RegionE",
    "self_type" : "_ZTIN7android6RegionE",
-   "size" : 20,
+   "size" : 84,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -54457,60 +53987,6 @@
      "referenced_type" : "_ZTIN7android10VectorImplE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android6VectorINS_4RectEEE",
-   "name" : "android::Vector<android::Rect>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "self_type" : "_ZTIN7android6VectorINS_4RectEEE",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "_ZTIN7android4RectE" ],
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_4RectEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_4RectEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_4RectEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN7android10VectorImplE"
-    }
-   ],
    "linker_set_key" : "_ZTIN7android6VectorINS_7AStringEEE",
    "name" : "android::Vector<android::AString>",
    "record_kind" : "class",
@@ -55309,7 +54785,7 @@
    "name" : "android::Surface::BufferSlot",
    "referenced_type" : "_ZTIN7android7Surface10BufferSlotE",
    "self_type" : "_ZTIN7android7Surface10BufferSlotE",
-   "size" : 24,
+   "size" : 88,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h"
   },
   {
@@ -55547,325 +55023,325 @@
     {
      "access" : "protected",
      "field_name" : "mReqWidth",
-     "field_offset" : 13248,
+     "field_offset" : 46016,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqHeight",
-     "field_offset" : 13280,
+     "field_offset" : 46048,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mReqFormat",
-     "field_offset" : 13312,
+     "field_offset" : 46080,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mReqUsage",
-     "field_offset" : 13344,
+     "field_offset" : 46112,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestamp",
-     "field_offset" : 13408,
+     "field_offset" : 46176,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mDataSpace",
-     "field_offset" : 13472,
+     "field_offset" : 46240,
      "referenced_type" : "_ZTIN7android8hardware8graphics6common4V1_29DataspaceE"
     },
     {
      "access" : "protected",
      "field_name" : "mHdrMetadata",
-     "field_offset" : 13504,
+     "field_offset" : 46272,
      "referenced_type" : "_ZTIN7android11HdrMetadataE"
     },
     {
      "access" : "protected",
      "field_name" : "mCrop",
-     "field_offset" : 14016,
+     "field_offset" : 46784,
      "referenced_type" : "_ZTIN7android4RectE"
     },
     {
      "access" : "protected",
      "field_name" : "mScalingMode",
-     "field_offset" : 14144,
+     "field_offset" : 46912,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mTransform",
-     "field_offset" : 14176,
+     "field_offset" : 46944,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mStickyTransform",
-     "field_offset" : 14208,
+     "field_offset" : 46976,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultWidth",
-     "field_offset" : 14240,
+     "field_offset" : 47008,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mDefaultHeight",
-     "field_offset" : 14272,
+     "field_offset" : 47040,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserWidth",
-     "field_offset" : 14304,
+     "field_offset" : 47072,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mUserHeight",
-     "field_offset" : 14336,
+     "field_offset" : 47104,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mTransformHint",
-     "field_offset" : 14368,
+     "field_offset" : 47136,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mProducerControlledByApp",
-     "field_offset" : 14400,
+     "field_offset" : 47168,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSwapIntervalZero",
-     "field_offset" : 14408,
+     "field_offset" : 47176,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mConsumerRunningBehind",
-     "field_offset" : 14416,
+     "field_offset" : 47184,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mMutex",
-     "field_offset" : 14432,
+     "field_offset" : 47200,
      "referenced_type" : "_ZTIN7android5MutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mInterceptorMutex",
-     "field_offset" : 14464,
+     "field_offset" : 47232,
      "referenced_type" : "_ZTINSt3__112shared_mutexE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptor",
-     "field_offset" : 14592,
+     "field_offset" : 47360,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mCancelInterceptorData",
-     "field_offset" : 14624,
+     "field_offset" : 47392,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptor",
-     "field_offset" : 14656,
+     "field_offset" : 47424,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_PP19ANativeWindowBufferPiEPvS3_S4_E"
     },
     {
      "access" : "protected",
      "field_name" : "mDequeueInterceptorData",
-     "field_offset" : 14688,
+     "field_offset" : 47456,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptor",
-     "field_offset" : 14720,
+     "field_offset" : 47488,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_iPcEPviS1_E"
     },
     {
      "access" : "protected",
      "field_name" : "mPerformInterceptorData",
-     "field_offset" : 14752,
+     "field_offset" : 47520,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptor",
-     "field_offset" : 14784,
+     "field_offset" : 47552,
      "referenced_type" : "_ZTIPFiP13ANativeWindowPFiS0_P19ANativeWindowBufferiEPvS2_iE"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueInterceptorData",
-     "field_offset" : 14816,
+     "field_offset" : 47584,
      "referenced_type" : "_ZTIPv"
     },
     {
      "access" : "protected",
      "field_name" : "mLockedBuffer",
-     "field_offset" : 14848,
+     "field_offset" : 47616,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mPostedBuffer",
-     "field_offset" : 14880,
+     "field_offset" : 47648,
      "referenced_type" : "_ZTIN7android2spINS_13GraphicBufferEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mConnectedToCpu",
-     "field_offset" : 14912,
+     "field_offset" : 47680,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mDirtyRegion",
-     "field_offset" : 14944,
+     "field_offset" : 47712,
      "referenced_type" : "_ZTIN7android6RegionE"
     },
     {
      "access" : "protected",
      "field_name" : "mBufferAge",
-     "field_offset" : 15104,
+     "field_offset" : 48384,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mGenerationNumber",
-     "field_offset" : 15168,
+     "field_offset" : 48448,
      "referenced_type" : "_ZTIj"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferMode",
-     "field_offset" : 15200,
+     "field_offset" : 48480,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoRefresh",
-     "field_offset" : 15208,
+     "field_offset" : 48488,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mAutoPrerotation",
-     "field_offset" : 15216,
+     "field_offset" : 48496,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferSlot",
-     "field_offset" : 15232,
+     "field_offset" : 48512,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mSharedBufferHasBeenQueued",
-     "field_offset" : 15264,
+     "field_offset" : 48544,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueDuration",
-     "field_offset" : 15296,
+     "field_offset" : 48576,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastQueueDuration",
-     "field_offset" : 15360,
+     "field_offset" : 48640,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mLastDequeueStartTime",
-     "field_offset" : 15424,
+     "field_offset" : 48704,
      "referenced_type" : "_ZTIx"
     },
     {
      "access" : "protected",
      "field_name" : "mQueueBufferCondition",
-     "field_offset" : 15488,
+     "field_offset" : 48768,
      "referenced_type" : "_ZTIN7android9ConditionE"
     },
     {
      "access" : "protected",
      "field_name" : "mNextFrameNumber",
-     "field_offset" : 15520,
+     "field_offset" : 48800,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mLastFrameNumber",
-     "field_offset" : 15584,
+     "field_offset" : 48864,
      "referenced_type" : "_ZTIy"
     },
     {
      "access" : "protected",
      "field_name" : "mQueriedSupportedTimestamps",
-     "field_offset" : 15648,
+     "field_offset" : 48928,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameTimestampsSupportsPresent",
-     "field_offset" : 15656,
+     "field_offset" : 48936,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableFrameTimestamps",
-     "field_offset" : 15664,
+     "field_offset" : 48944,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mFrameEventHistory",
-     "field_offset" : 15680,
+     "field_offset" : 48960,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android25ProducerFrameEventHistoryENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mReportRemovedBuffers",
-     "field_offset" : 15712,
+     "field_offset" : 48992,
      "referenced_type" : "_ZTIb"
     },
     {
      "access" : "protected",
      "field_name" : "mRemovedBuffers",
-     "field_offset" : 15744,
+     "field_offset" : 49024,
      "referenced_type" : "_ZTINSt3__16vectorIN7android2spINS1_13GraphicBufferEEENS_9allocatorIS4_EEEE"
     },
     {
      "access" : "protected",
      "field_name" : "mMaxBufferCount",
-     "field_offset" : 15840,
+     "field_offset" : 49120,
      "referenced_type" : "_ZTIi"
     },
     {
      "access" : "protected",
      "field_name" : "mListenerProxy",
-     "field_offset" : 15872,
+     "field_offset" : 49152,
      "referenced_type" : "_ZTIN7android2spINS_17IProducerListenerEEE"
     }
    ],
@@ -55874,7 +55350,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android7SurfaceE",
    "self_type" : "_ZTIN7android7SurfaceE",
-   "size" : 1988,
+   "size" : 6148,
    "source_file" : "/frameworks/native/libs/gui/include/gui/Surface.h",
    "vtable_components" :
    [
@@ -56786,7 +56262,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerI13native_handleEUt_E",
@@ -56826,7 +56302,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIK13native_handleEUt_E",
@@ -56866,7 +56342,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIKcEUt_E",
@@ -56906,7 +56382,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E",
@@ -56946,7 +56422,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E",
@@ -56986,7 +56462,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup5ValueEEUt_E",
@@ -57026,7 +56502,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup6MetricEEUt_E",
@@ -57066,7 +56542,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroup9AttributeEEUt_E",
@@ -57106,7 +56582,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E",
@@ -57149,7 +56625,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E",
@@ -57189,7 +56665,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5)",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
    "self_type" : "_ZTIN7android8hardware7details12hidl_pointerIhEUt_E",
@@ -58879,6 +58355,32 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "_ZTINSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEEE"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mAllocation",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN7android18InlineStdAllocatorINS_4RectELj4EE10AllocationE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "name" : "android::FatVector<android::Rect, 4>",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "self_type" : "_ZTIN7android9FatVectorINS_4RectELj4EEE",
+   "size" : 84,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FatVector.h",
+   "template_args" : [ "_ZTIN7android4RectE" ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "_ZTIN7android11FlattenableINS_9FenceTime8SnapshotEEE"
     }
    ],
@@ -59009,7 +58511,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_x86_64/source-based/libnativewindow.so.lsdump b/30/64/x86_x86_64/source-based/libnativewindow.so.lsdump
index d07ec01..f0508e4 100644
--- a/30/64/x86_x86_64/source-based/libnativewindow.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libnativewindow.so.lsdump
@@ -1203,6 +1203,27 @@
    "enum_fields" :
    [
     {
+     "enum_field_value" : 0,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
+    }
+   ],
+   "linker_set_key" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "name" : "ANativeWindow_FrameRateCompatibility",
+   "referenced_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "self_type" : "_ZTI36ANativeWindow_FrameRateCompatibility",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 5,
      "name" : "AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM"
     },
@@ -1258,27 +1279,6 @@
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/hardware_buffer.h",
    "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE"
-    }
-   ],
-   "linker_set_key" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "name" : "(anonymous enum at frameworks/native/libs/nativewindow/include/android/native_window.h:237:1)",
-   "referenced_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "self_type" : "_ZTI47$ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/native_window.h",
-   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -1769,7 +1769,7 @@
      "referenced_type" : "_ZTIP19ANativeWindowBuffer"
     }
    ],
-   "return_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
+   "return_type" : "_ZTIP15AHardwareBuffer",
    "source_file" : "/frameworks/native/libs/nativewindow/include/vndk/window.h"
   },
   {
@@ -2667,15 +2667,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK13native_handle",
-   "name" : "const native_handle *",
-   "referenced_type" : "_ZTIK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "self_type" : "_ZTIPK13native_handle#ODR:out/soong/.intermediates/frameworks/native/libs/nativewindow/libnativewindow/android_x86_x86_64_static/obj/frameworks/native/libs/nativewindow/ANativeWindow.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15AHardwareBuffer",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "_ZTIK15AHardwareBuffer",
@@ -2868,7 +2859,7 @@
    "name" : "const android::GraphicBuffer",
    "referenced_type" : "_ZTIN7android13GraphicBufferE",
    "self_type" : "_ZTIKN7android13GraphicBufferE",
-   "size" : 156,
+   "size" : 148,
    "source_file" : "/frameworks/native/libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h"
   },
   {
diff --git a/30/64/x86_x86_64/source-based/libneuralnetworks.so.lsdump b/30/64/x86_x86_64/source-based/libneuralnetworks.so.lsdump
index c95edb4..d6197ff 100644
--- a/30/64/x86_x86_64/source-based/libneuralnetworks.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libneuralnetworks.so.lsdump
@@ -2432,24 +2432,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *",
    "referenced_type" : "_ZTIK20ANeuralNetworksEvent",
@@ -2459,24 +2441,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
    "name" : "const ANeuralNetworksModel *",
    "referenced_type" : "_ZTIK20ANeuralNetworksModel",
@@ -2486,24 +2450,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK20ANeuralNetworksModel",
-   "name" : "const ANeuralNetworksModel *",
-   "referenced_type" : "_ZTIK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *",
    "referenced_type" : "_ZTIK21ANeuralNetworksDevice",
@@ -2513,24 +2459,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
    "name" : "const ANeuralNetworksMemory *",
    "referenced_type" : "_ZTIK21ANeuralNetworksMemory",
@@ -2540,24 +2468,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK21ANeuralNetworksMemory",
-   "name" : "const ANeuralNetworksMemory *",
-   "referenced_type" : "_ZTIK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
    "name" : "const ANeuralNetworksExecution *",
    "referenced_type" : "_ZTIK24ANeuralNetworksExecution",
@@ -2567,24 +2477,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK24ANeuralNetworksExecution",
-   "name" : "const ANeuralNetworksExecution *",
-   "referenced_type" : "_ZTIK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
    "name" : "const ANeuralNetworksMemoryDesc *",
    "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc",
@@ -2594,24 +2486,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK25ANeuralNetworksMemoryDesc",
-   "name" : "const ANeuralNetworksMemoryDesc *",
-   "referenced_type" : "_ZTIK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
    "name" : "const ANeuralNetworksCompilation *",
    "referenced_type" : "_ZTIK26ANeuralNetworksCompilation",
@@ -2621,24 +2495,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK26ANeuralNetworksCompilation",
-   "name" : "const ANeuralNetworksCompilation *",
-   "referenced_type" : "_ZTIK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPK26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK26ANeuralNetworksOperandType",
    "name" : "const ANeuralNetworksOperandType *",
    "referenced_type" : "_ZTIK26ANeuralNetworksOperandType",
@@ -2666,33 +2522,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const *",
-   "referenced_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const *",
    "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice",
@@ -2702,33 +2531,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const *",
-   "referenced_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIPKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
    "referenced_type" : "_ZTIKc",
@@ -2783,24 +2585,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksBurst",
-   "name" : "ANeuralNetworksBurst **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksBurst#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
    "name" : "ANeuralNetworksEvent **",
    "referenced_type" : "_ZTIP20ANeuralNetworksEvent",
@@ -2810,24 +2594,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksEvent",
-   "name" : "ANeuralNetworksEvent **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
    "name" : "ANeuralNetworksModel **",
    "referenced_type" : "_ZTIP20ANeuralNetworksModel",
@@ -2837,24 +2603,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP20ANeuralNetworksModel",
-   "name" : "ANeuralNetworksModel **",
-   "referenced_type" : "_ZTIP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP20ANeuralNetworksModel#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
    "name" : "ANeuralNetworksDevice **",
    "referenced_type" : "_ZTIP21ANeuralNetworksDevice",
@@ -2864,24 +2612,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksDevice",
-   "name" : "ANeuralNetworksDevice **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
    "name" : "ANeuralNetworksMemory **",
    "referenced_type" : "_ZTIP21ANeuralNetworksMemory",
@@ -2891,24 +2621,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP21ANeuralNetworksMemory",
-   "name" : "ANeuralNetworksMemory **",
-   "referenced_type" : "_ZTIP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP21ANeuralNetworksMemory#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
    "name" : "ANeuralNetworksExecution **",
    "referenced_type" : "_ZTIP24ANeuralNetworksExecution",
@@ -2918,24 +2630,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP24ANeuralNetworksExecution",
-   "name" : "ANeuralNetworksExecution **",
-   "referenced_type" : "_ZTIP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP24ANeuralNetworksExecution#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
    "name" : "ANeuralNetworksMemoryDesc **",
    "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc",
@@ -2945,24 +2639,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP25ANeuralNetworksMemoryDesc",
-   "name" : "ANeuralNetworksMemoryDesc **",
-   "referenced_type" : "_ZTIP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP25ANeuralNetworksMemoryDesc#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
    "name" : "ANeuralNetworksCompilation **",
    "referenced_type" : "_ZTIP26ANeuralNetworksCompilation",
@@ -2972,24 +2648,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPP26ANeuralNetworksCompilation",
-   "name" : "ANeuralNetworksCompilation **",
-   "referenced_type" : "_ZTIP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIPP26ANeuralNetworksCompilation#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -3153,36 +2811,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
    "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
-   "referenced_type" : "_ZTIPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK20ANeuralNetworksEvent#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK20ANeuralNetworksEvent",
-   "name" : "const ANeuralNetworksEvent *const",
    "referenced_type" : "_ZTIPK20ANeuralNetworksEvent",
    "self_type" : "_ZTIKPK20ANeuralNetworksEvent",
    "size" : 4,
@@ -3193,36 +2821,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
    "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump#ODR:",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
-   "referenced_type" : "_ZTIPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "self_type" : "_ZTIKPK21ANeuralNetworksDevice#ODR:out/soong/.intermediates/frameworks/ml/nn/runtime/libneuralnetworks/android_x86_x86_64_shared/obj/frameworks/ml/nn/runtime/NeuralNetworks.sdump",
-   "size" : 4,
-   "source_file" : "/frameworks/ml/nn/runtime/include/NeuralNetworks.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKPK21ANeuralNetworksDevice",
-   "name" : "const ANeuralNetworksDevice *const",
    "referenced_type" : "_ZTIPK21ANeuralNetworksDevice",
    "self_type" : "_ZTIKPK21ANeuralNetworksDevice",
    "size" : 4,
diff --git a/30/64/x86_x86_64/source-based/libvulkan.so.lsdump b/30/64/x86_x86_64/source-based/libvulkan.so.lsdump
index 6df248e..6345e58 100644
--- a/30/64/x86_x86_64/source-based/libvulkan.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libvulkan.so.lsdump
@@ -77,78 +77,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIA32_P18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 128,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA32_P18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *[32]",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIA32_P18VkPhysicalDevice_T",
    "size" : 128,
@@ -872,27 +800,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   }
  ],
  "enum_types" :
@@ -11602,7 +11518,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK24VkCommandBufferBeginInfo"
@@ -11695,7 +11611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11716,7 +11632,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPK21VkRenderPassBeginInfo"
@@ -11734,7 +11650,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11767,7 +11683,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11788,7 +11704,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI19VkPipelineBindPoint"
@@ -11806,7 +11722,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11830,7 +11746,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11863,7 +11779,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11887,7 +11803,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11914,7 +11830,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11941,7 +11857,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11965,7 +11881,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -11992,7 +11908,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12022,7 +11938,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12049,7 +11965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12082,7 +11998,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12103,7 +12019,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12133,7 +12049,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12151,7 +12067,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12175,7 +12091,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12202,7 +12118,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12226,7 +12142,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12250,7 +12166,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12268,7 +12184,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12280,13 +12196,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12298,7 +12214,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12322,7 +12238,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI17VkSubpassContents"
@@ -12337,7 +12253,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12376,7 +12292,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12403,7 +12319,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12421,7 +12337,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12442,7 +12358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12472,7 +12388,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIPKf"
@@ -12487,7 +12403,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12508,7 +12424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12526,7 +12442,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12541,7 +12457,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12559,7 +12475,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIf"
@@ -12574,7 +12490,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12595,7 +12511,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12613,7 +12529,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12631,7 +12547,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12649,7 +12565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12670,7 +12586,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12694,7 +12610,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12736,7 +12652,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTI23VkPipelineStageFlagBits"
@@ -12931,7 +12847,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK18VkDeviceCreateInfo"
@@ -13729,7 +13645,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTI8VkResult",
@@ -13741,7 +13657,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -13762,7 +13678,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -13888,7 +13804,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIPKP17VkCommandBuffer_T"
     }
    ],
    "return_type" : "_ZTIv",
@@ -14302,7 +14218,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK34VkPhysicalDeviceExternalBufferInfo"
@@ -14320,7 +14236,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK33VkPhysicalDeviceExternalFenceInfo"
@@ -14338,7 +14254,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK37VkPhysicalDeviceExternalSemaphoreInfo"
@@ -14356,7 +14272,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP24VkPhysicalDeviceFeatures"
@@ -14371,7 +14287,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP25VkPhysicalDeviceFeatures2"
@@ -14386,7 +14302,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14404,7 +14320,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14422,7 +14338,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14452,7 +14368,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK32VkPhysicalDeviceImageFormatInfo2"
@@ -14470,7 +14386,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP32VkPhysicalDeviceMemoryProperties"
@@ -14485,7 +14401,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP33VkPhysicalDeviceMemoryProperties2"
@@ -14500,7 +14416,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14521,7 +14437,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP26VkPhysicalDeviceProperties"
@@ -14536,7 +14452,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIP27VkPhysicalDeviceProperties2"
@@ -14551,7 +14467,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14569,7 +14485,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -14587,7 +14503,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTI8VkFormat"
@@ -14620,7 +14536,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIPK38VkPhysicalDeviceSparseImageFormatInfo2"
@@ -14641,7 +14557,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14659,7 +14575,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14680,7 +14596,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -14701,7 +14617,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP18VkPhysicalDevice_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14950,7 +14866,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump"
+     "referenced_type" : "_ZTIP17VkCommandBuffer_T"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -15719,15 +15635,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK15AHardwareBuffer",
-   "name" : "const AHardwareBuffer *",
-   "referenced_type" : "_ZTIK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPK15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK15VkMemoryBarrier",
    "name" : "const VkMemoryBarrier *",
    "referenced_type" : "_ZTIK15VkMemoryBarrier",
@@ -16853,78 +16760,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const *",
-   "referenced_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const *",
    "referenced_type" : "_ZTIKP18VkPhysicalDevice_T",
@@ -16934,78 +16769,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const *",
-   "referenced_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIPKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKPKc",
    "name" : "const char *const *",
    "referenced_type" : "_ZTIKPKc",
@@ -17078,15 +16841,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP10VkDevice_T",
-   "name" : "VkDevice_T **",
-   "referenced_type" : "_ZTIP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP10VkDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP12VkInstance_T",
    "name" : "VkInstance_T **",
    "referenced_type" : "_ZTIP12VkInstance_T",
@@ -17096,18 +16850,9 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP12VkInstance_T",
-   "name" : "VkInstance_T **",
-   "referenced_type" : "_ZTIP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP12VkInstance_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPP15AHardwareBuffer",
    "name" : "AHardwareBuffer **",
-   "referenced_type" : "_ZTIP15AHardwareBuffer#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP15AHardwareBuffer",
    "self_type" : "_ZTIPP15AHardwareBuffer",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_android.h"
@@ -17116,7 +16861,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T **",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIPP17VkCommandBuffer_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17125,7 +16870,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T **",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
+   "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIPP18VkPhysicalDevice_T",
    "size" : 4,
    "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
@@ -17141,15 +16886,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP9VkQueue_T",
-   "name" : "VkQueue_T **",
-   "referenced_type" : "_ZTIP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIPP9VkQueue_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
    "referenced_type" : "_ZTIPv",
@@ -18550,86 +18286,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
    "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
-   "referenced_type" : "_ZTIP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP17VkCommandBuffer_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP17VkCommandBuffer_T",
-   "name" : "VkCommandBuffer_T *const",
    "referenced_type" : "_ZTIP17VkCommandBuffer_T",
    "self_type" : "_ZTIKP17VkCommandBuffer_T",
    "size" : 4,
@@ -18640,86 +18296,6 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
    "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/api_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/debug_report.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/driver_gen.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/layers_extensions.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/stubhal.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
-   "referenced_type" : "_ZTIP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "self_type" : "_ZTIKP18VkPhysicalDevice_T#ODR:out/soong/.intermediates/frameworks/native/vulkan/libvulkan/libvulkan/android_x86_x86_64_shared/obj/frameworks/native/vulkan/libvulkan/swapchain.sdump",
-   "size" : 4,
-   "source_file" : "/external/vulkan-headers/include/vulkan/vulkan_core.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKP18VkPhysicalDevice_T",
-   "name" : "VkPhysicalDevice_T *const",
    "referenced_type" : "_ZTIP18VkPhysicalDevice_T",
    "self_type" : "_ZTIKP18VkPhysicalDevice_T",
    "size" : 4,
diff --git a/30/64/x86_x86_64/source-based/libz.so.lsdump b/30/64/x86_x86_64/source-based/libz.so.lsdump
index f50c122..ef28159 100644
--- a/30/64/x86_x86_64/source-based/libz.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libz.so.lsdump
@@ -2239,42 +2239,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_x86_64_static/obj/external/zlib/crc32.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_x86_64_static/obj/external/zlib/crc32.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_x86_64_static/obj/external/zlib/deflate.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_x86_64_static/obj/external/zlib/deflate.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18static_tree_desc_s",
-   "name" : "const static_tree_desc_s *",
-   "referenced_type" : "_ZTIK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_x86_64_static/obj/external/zlib/trees.sdump",
-   "self_type" : "_ZTIPK18static_tree_desc_s#ODR:out/soong/.intermediates/external/zlib/libz/android_x86_x86_64_static/obj/external/zlib/trees.sdump",
-   "size" : 4,
-   "source_file" : "/external/zlib/deflate.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK4code",
    "name" : "const code *",
    "referenced_type" : "_ZTIK4code",