Merge "Revert "Update VNDK ABI dumps for version 34, ARM"" into main

153 files changed, 34754 insertions, 21961 deletions

diff --git a/34/64/arm/source-based/android.hardware.audio.common@2.0.so.lsdump b/34/64/arm/source-based/android.hardware.audio.common@2.0.so.lsdump
index c37d7ee3..17915e95 100644
--- a/34/64/arm/source-based/android.hardware.audio.common@2.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.audio.common@2.0.so.lsdump
@@ -2668,7 +2668,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::NONE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::BIT_IN"
     },
     {
@@ -2808,119 +2808,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2937,7 +2937,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3085,7 +3085,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -3666,7 +3666,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -3890,39 +3890,39 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_HDR"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
index e86f49fb..f901d935 100644
--- a/34/64/arm/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
@@ -636,7 +636,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -644,7 +644,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
index 6d7b41ac..4e8fa1db 100644
--- a/34/64/arm/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
@@ -3691,11 +3691,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
index 361f894d..3f95b13b 100644
--- a/34/64/arm/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
@@ -3685,11 +3685,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4276,11 +4276,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4861,11 +4861,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
index 53679389..709df671 100644
--- a/34/64/arm/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
@@ -563,7 +563,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -571,7 +571,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.graphics.common@1.0.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.common@1.0.so.lsdump
index 57cca99b..9955685d 100644
--- a/34/64/arm/source-based/android.hardware.graphics.common@1.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.common@1.0.so.lsdump
@@ -2857,11 +2857,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.graphics.common@1.1.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.common@1.1.so.lsdump
index 60ead84b..98503a3d 100644
--- a/34/64/arm/source-based/android.hardware.graphics.common@1.1.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.common@1.1.so.lsdump
@@ -2857,11 +2857,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3448,11 +3448,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/android.hardware.graphics.common@1.2.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.common@1.2.so.lsdump
index 881e0207..1f58c7c7 100644
--- a/34/64/arm/source-based/android.hardware.graphics.common@1.2.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.common@1.2.so.lsdump
@@ -2874,11 +2874,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3465,11 +3465,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4050,11 +4050,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/android.hardware.graphics.mapper@2.0.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
index 55600149..827aa92e 100644
--- a/34/64/arm/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
@@ -3231,11 +3231,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.graphics.mapper@2.1.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
index b788925f..9551dac6 100644
--- a/34/64/arm/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
@@ -3229,11 +3229,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3820,11 +3820,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/android.hardware.graphics.mapper@3.0.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
index 7e65fbc3..66b06bbe 100644
--- a/34/64/arm/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
@@ -3267,11 +3267,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3858,11 +3858,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4443,11 +4443,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/android.hardware.graphics.mapper@4.0.so.lsdump b/34/64/arm/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
index 25beb122..75a5d1e2 100644
--- a/34/64/arm/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
@@ -3363,11 +3363,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3954,11 +3954,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4539,11 +4539,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/android.hardware.media.omx@1.0.so.lsdump b/34/64/arm/source-based/android.hardware.media.omx@1.0.so.lsdump
index 470db12a..ac239e0d 100644
--- a/34/64/arm/source-based/android.hardware.media.omx@1.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.media.omx@1.0.so.lsdump
@@ -5061,11 +5061,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.media@1.0.so.lsdump b/34/64/arm/source-based/android.hardware.media@1.0.so.lsdump
index d2b324c0..639b86b5 100644
--- a/34/64/arm/source-based/android.hardware.media@1.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.media@1.0.so.lsdump
@@ -2865,11 +2865,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/arm/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index 8ea6dc92..0a44f9ce 100644
--- a/34/64/arm/source-based/android.hardware.soundtrigger@2.0.so.lsdump
+++ b/34/64/arm/source-based/android.hardware.soundtrigger@2.0.so.lsdump
@@ -3419,7 +3419,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::NONE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::BIT_IN"
     },
     {
@@ -3559,119 +3559,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3688,7 +3688,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3836,7 +3836,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -4417,7 +4417,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -4641,39 +4641,39 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_HDR"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump b/34/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 4ee20161..0a7b8b3f 100644
--- a/34/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/34/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -839,31 +839,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv7-a-neon_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
@@ -16874,7 +16849,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16883,7 +16858,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16898,7 +16873,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16907,7 +16882,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16922,7 +16897,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16931,7 +16906,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16946,7 +16921,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16955,7 +16930,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -37140,7 +37115,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -41704,7 +41679,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -41744,7 +41719,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -41754,7 +41729,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -41764,7 +41739,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -42560,7 +42535,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -42569,7 +42544,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm/source-based/android.hidl.token@1.0-utils.so.lsdump b/34/64/arm/source-based/android.hidl.token@1.0-utils.so.lsdump
index 1949b6e0..900521b8 100644
--- a/34/64/arm/source-based/android.hidl.token@1.0-utils.so.lsdump
+++ b/34/64/arm/source-based/android.hidl.token@1.0-utils.so.lsdump
@@ -5946,12 +5946,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/arm/source-based/libRSCpuRef.so.lsdump b/34/64/arm/source-based/libRSCpuRef.so.lsdump
index 2a7d184f..c09d2123 100644
--- a/34/64/arm/source-based/libRSCpuRef.so.lsdump
+++ b/34/64/arm/source-based/libRSCpuRef.so.lsdump
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -322,7 +322,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -601,7 +601,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5831,7 +5831,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5847,11 +5847,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5860,7 +5860,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6113,31 +6113,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv7-a-neon_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
@@ -9753,7 +9728,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9771,7 +9746,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9804,7 +9779,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9819,7 +9794,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9837,7 +9812,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9855,7 +9830,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9882,7 +9857,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9918,7 +9893,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9936,7 +9911,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9957,7 +9932,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9981,7 +9956,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10017,7 +9992,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10056,7 +10031,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10092,7 +10067,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10131,7 +10106,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10164,7 +10139,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10182,7 +10157,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10299,7 +10274,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10320,7 +10295,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -21935,7 +21910,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21944,7 +21919,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21998,7 +21973,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22016,7 +21991,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22106,7 +22081,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22115,7 +22090,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22475,7 +22450,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22484,7 +22459,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22493,7 +22468,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22502,7 +22477,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22511,7 +22486,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22520,7 +22495,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22529,7 +22504,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22547,7 +22522,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22556,7 +22531,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22565,7 +22540,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22574,7 +22549,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22583,7 +22558,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22592,7 +22567,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22601,7 +22576,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22610,7 +22585,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22619,7 +22594,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22628,7 +22603,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22691,7 +22666,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22700,7 +22675,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23258,7 +23233,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23303,7 +23278,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23312,7 +23287,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23462,8 +23437,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23912,8 +23887,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -29918,7 +29893,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -29972,7 +29947,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30698,7 +30673,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -30748,7 +30723,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -30758,7 +30733,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -34411,7 +34386,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -35641,7 +35616,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -35697,7 +35672,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -36216,7 +36191,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36552,7 +36527,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36945,7 +36920,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37082,7 +37057,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -45350,7 +45325,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45431,7 +45406,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46206,7 +46181,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46223,7 +46198,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46233,7 +46208,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46250,7 +46225,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -55369,7 +55344,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55378,7 +55353,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55393,7 +55368,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55402,7 +55377,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55417,7 +55392,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55426,7 +55401,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55441,7 +55416,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55450,7 +55425,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126879,7 +126854,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -126888,7 +126863,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -126906,7 +126881,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2>",
+   "name" : "std::__make_tuple_indices<2, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -148554,7 +148529,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -148594,7 +148569,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -148604,7 +148579,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -148614,7 +148589,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -148717,7 +148692,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148831,7 +148806,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148945,7 +148920,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -149044,7 +149019,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -149863,7 +149838,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -149872,7 +149847,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm/source-based/libRSDriver.so.lsdump b/34/64/arm/source-based/libRSDriver.so.lsdump
index c06cd1ae..6e150ad2 100644
--- a/34/64/arm/source-based/libRSDriver.so.lsdump
+++ b/34/64/arm/source-based/libRSDriver.so.lsdump
@@ -5864,7 +5864,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5880,71 +5880,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6156,31 +6156,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv7-a-neon_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
@@ -10507,7 +10482,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10531,7 +10506,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11218,7 +11193,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -26363,8 +26338,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -32338,7 +32313,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -68440,7 +68415,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
diff --git a/34/64/arm/source-based/libRS_internal.so.lsdump b/34/64/arm/source-based/libRS_internal.so.lsdump
index a876bc3f..debd4171 100644
--- a/34/64/arm/source-based/libRS_internal.so.lsdump
+++ b/34/64/arm/source-based/libRS_internal.so.lsdump
@@ -8196,7 +8196,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -8212,71 +8212,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8468,31 +8468,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv7-a-neon_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
@@ -31855,7 +31830,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37666,8 +37641,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37909,8 +37884,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37918,8 +37893,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37927,8 +37902,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37936,8 +37911,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -73455,7 +73430,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73464,7 +73439,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73479,7 +73454,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73488,7 +73463,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73503,7 +73478,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73512,7 +73487,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73527,7 +73502,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73536,7 +73511,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -124972,7 +124947,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138460,7 +138435,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -138603,7 +138578,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146157,7 +146132,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -155482,7 +155457,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -155522,7 +155497,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -155532,7 +155507,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -155542,7 +155517,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -156300,7 +156275,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -156309,7 +156284,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm/source-based/libaudioutils.so.lsdump b/34/64/arm/source-based/libaudioutils.so.lsdump
index a2f72609..98fe0b7a 100644
--- a/34/64/arm/source-based/libaudioutils.so.lsdump
+++ b/34/64/arm/source-based/libaudioutils.so.lsdump
@@ -1999,14 +1999,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE25__emplace_unique_key_argsIjJRKNS_4pairIKjS6_EEEEENSK_INS_15__hash_iteratorIPNS_11__hash_nodeIS7_PvEEEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE8__rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112basic_stringIhNS_11char_traitsIhEENS_9allocatorIhEEE21__grow_by_and_replaceEjjjjjjPKh"
   },
   {
@@ -3198,7 +3190,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3436,119 +3428,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 2214592512,
+     "enum_field_value" : -2080374784,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : 2281701376,
+     "enum_field_value" : -2013265920,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : 2281701377,
+     "enum_field_value" : -2013265919,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : 2415919104,
+     "enum_field_value" : -1879048192,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : 2684354560,
+     "enum_field_value" : -1610612736,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3560,15 +3552,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4371,15 +4363,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 3743416319,
+     "enum_field_value" : -551550977,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4861,99 +4853,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : 2147484159,
+     "enum_field_value" : -2147483137,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : 2147484671,
+     "enum_field_value" : -2147482625,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : 2147485695,
+     "enum_field_value" : -2147481601,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : 2147487743,
+     "enum_field_value" : -2147479553,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : 2147491839,
+     "enum_field_value" : -2147475457,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : 2147500031,
+     "enum_field_value" : -2147467265,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : 2147516415,
+     "enum_field_value" : -2147450881,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : 2147549183,
+     "enum_field_value" : -2147418113,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : 2147614719,
+     "enum_field_value" : -2147352577,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : 2147745791,
+     "enum_field_value" : -2147221505,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : 2148007935,
+     "enum_field_value" : -2146959361,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : 2148532223,
+     "enum_field_value" : -2146435073,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : 2149580799,
+     "enum_field_value" : -2145386497,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : 2151677951,
+     "enum_field_value" : -2143289345,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : 2155872255,
+     "enum_field_value" : -2139095041,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : 2164260863,
+     "enum_field_value" : -2130706433,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4969,7 +4961,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5691,7 +5683,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5766,7 +5758,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5787,7 +5779,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -15174,7 +15166,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -16804,7 +16796,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 4,
@@ -16813,7 +16805,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 4,
@@ -16822,7 +16814,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 4,
@@ -16939,7 +16931,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -21639,7 +21631,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 96,
@@ -21665,7 +21657,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 160,
@@ -21691,7 +21683,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 64,
@@ -22029,7 +22021,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/arm/source-based/libbase.so.lsdump b/34/64/arm/source-based/libbase.so.lsdump
index f2be966a..41f9fe0e 100644
--- a/34/64/arm/source-based/libbase.so.lsdump
+++ b/34/64/arm/source-based/libbase.so.lsdump
@@ -1048,21 +1048,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -1899,7 +1890,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1950,7 +1941,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2706,7 +2697,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2740,7 +2731,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4747,23 +4738,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -4782,22 +4756,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -4814,22 +4772,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
diff --git a/34/64/arm/source-based/libbinder.so.lsdump b/34/64/arm/source-based/libbinder.so.lsdump
index 454efbe9..8f7aa514 100644
--- a/34/64/arm/source-based/libbinder.so.lsdump
+++ b/34/64/arm/source-based/libbinder.so.lsdump
@@ -73,15 +73,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA1_Ds",
-   "name" : "char16_t[1]",
-   "referenced_type" : "_ZTIDs",
-   "self_type" : "_ZTIA1_Ds",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA1_N3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>>[1]",
@@ -100,6 +91,15 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "linker_set_key" : "_ZTIA20_Ds",
+   "name" : "char16_t[20]",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIA20_Ds",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA20_y",
    "name" : "unsigned long long[20]",
@@ -1066,6 +1066,34 @@
    "name" : "_ZN7android10zeroMemoryEPhj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv"
+  },
+  {
    "name" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE"
   },
   {
@@ -1837,6 +1865,214 @@
    "name" : "_ZN7android2os20ParcelFileDescriptorD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9HeapCacheEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_"
+  },
+  {
    "name" : "_ZN7android33makeDefaultRpcTransportCtxFactoryEv"
   },
   {
@@ -1921,21 +2157,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -2101,6 +2328,22 @@
    "name" : "_ZN7android4base8EndsWithENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEc"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_"
+  },
+  {
    "name" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_"
   },
   {
@@ -2116,6 +2359,22 @@
    "name" : "_ZN7android4base9ParseBoolENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
+  },
+  {
    "name" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj"
   },
   {
@@ -2167,6 +2426,14 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
+  },
+  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2305,9 +2572,6 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
-   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
-  },
-  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2515,9 +2779,6 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
-   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
-  },
-  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3055,9 +3316,6 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
-   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
-  },
-  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3268,10 +3526,7 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
-  },
-  {
-   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3589,6 +3844,22 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
+  },
+  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3718,9 +3989,6 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
-   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
-  },
-  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3739,6 +4007,14 @@
    "name" : "_ZNK7android6Parcel16readStrongBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3922,6 +4198,198 @@
    "name" : "_ZNK7android6Parcel9readInt64Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+  },
+  {
    "name" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE"
   },
   {
@@ -4028,10 +4496,462 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7__cloneEPNS0_6__baseISB_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7__cloneEPNS0_6__baseIS8_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7__cloneEPNS0_6__baseIS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7__cloneEPNS0_6__baseIS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE14__count_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEclES3_S4_S6_S6_jS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EEclEOS7_OS8_OSA_SF_OjSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_EclES5_OS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_EclES6_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_EclEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110shared_ptrIN7android6binder8internal21ClientCounterCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111__sift_downIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeESB_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRKNS_21piecewise_construct_tENS_5tupleIJRKiEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE4findIiEENS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS2_PvEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeIS2_PvEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__lower_boundIRNS_6__lessIjjEENS_11__wrap_iterIPKjEEjEET0_S8_S8_RKT1_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIDsNS_9allocatorIDsEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android8String16ENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIdNS_9allocatorIdEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIfNS_9allocatorIfEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIjNS_9allocatorIjEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIxNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIyNS_9allocatorIyEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113unordered_mapIijNS_4hashIiEENS_8equal_toIiEENS_9allocatorINS_4pairIKijEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__copy_alignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__copy_alignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__fill_n_falseINS_8__bitsetILj1ELj8EEEEEvNS_14__bit_iteratorIT_Lb0ELi0EEENS4_9size_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIDsRNS_9allocatorIDsEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSessionEEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSessionEEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_7IBinderEEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_7IBinderEEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4base14unique_fd_implINS2_13DefaultCloserEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4base14unique_fd_implINS2_13DefaultCloserEEERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8RpcState10BinderNode9AsyncTodoERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8RpcState10BinderNode9AsyncTodoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEEC2EjjS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEERNS5_ISA_EEEC2EjjSC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEERNS5_ISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEEC2EjjSD_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEERNS_9allocatorIS8_EEEC2EjjSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEERNS_9allocatorIS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalIN7android8String16EEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalIN7android8String16EEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIfRNS_9allocatorIfEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIfRNS_9allocatorIfEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIiRNS_9allocatorIiEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIjRNS_9allocatorIjEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIyRNS_9allocatorIyEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIyRNS_9allocatorIyEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4040,9 +4960,1329 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS1_2os17PersistableBundleENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S4_EEEEEixERS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIS2_NS_9allocatorIS2_EEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ES2_NS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S2_EEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EbNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_bEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EdNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_dEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EiNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_iEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ExNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_xEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_11__thread_idENS_6threadENS_4lessIS1_EENS_9allocatorINS_4pairIKS1_S2_EEEEEixEOS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceENS_4lessIS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINS9_15IServiceManager25LocalRegistrationCallbackEEENSA_INS9_18ServiceManagerShim18RegistrationWaiterEEEEENS4_ISH_EEEENS_4lessIS6_EENS4_INS8_IKS6_SJ_EEEEEixERSM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__construct_nodeIJRS5_EEENS_10unique_ptrINS_11__tree_nodeIS5_PvEENS_22__tree_node_destructorINS8_ISG_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSF_SF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE25__emplace_unique_key_argsIS5_JRS5_EEENS_4pairINS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE12__find_equalIS2_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISC_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSC_SC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE25__emplace_unique_key_argsIS2_JRKS2_EEENS_4pairINS_15__tree_iteratorIS2_PNS_11__tree_nodeIS2_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISK_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS5_JNS_4pairIKS5_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE4findIS5_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SG_EEiEERPNS_15__tree_end_nodeISI_EESJ_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISI_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE15__emplace_multiIJRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISQ_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_4pairIKS3_S5_EEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISN_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSI_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SO_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE8__detachEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_4pairIKS3_S3_EEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISL_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE13__move_assignERSB_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS2_JRKNS_21piecewise_construct_tENS_5tupleIJOS2_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSO_SO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISW_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSW_SW_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSW_IJEEEEEENS9_INS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE4findIS7_EENS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE5eraseENS_21__tree_const_iteratorISL_PNS_11__tree_nodeISL_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE7destroyEPNS_11__tree_nodeISL_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE13__lower_boundIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_SM_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISK_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE25__emplace_unique_key_argsIS5_JRKNS_21piecewise_construct_tENS_5tupleIJRKS5_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE4findIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE5eraseENS_21__tree_const_iteratorISA_PNS_11__tree_nodeISA_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE7destroyEPNS_11__tree_nodeISA_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSH_SH_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsIyJNS_4pairIKyS4_EEEEENSE_INS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE24__emplace_back_slow_pathIJDsEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE26__swap_out_circular_bufferERNS_14__split_bufferIDsRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE21__push_back_slow_pathIRKS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSessionEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6assignIPS2_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS2_NS_15iterator_traitsIS9_E9referenceEEE5valueEvE4typeES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIS6_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE21__push_back_slow_pathISA_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE26__swap_out_circular_bufferERNS_14__split_bufferISA_RSC_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE21__push_back_slow_pathIS8_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE24__emplace_back_slow_pathIJS6_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RSA_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE12__move_rangeEPS1_S5_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertENS_11__wrap_iterIPKS1_EEjRS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPKS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS9_E9referenceEEE5valueENS_11__wrap_iterIPS1_EEE4typeENSD_IS7_EES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIS6_EEE4typeENSC_IPKS1_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE9push_backERKb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6assignIPdEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIdNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE26__swap_out_circular_bufferERNS_14__split_bufferIfRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6assignIPiEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIRKjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE26__swap_out_circular_bufferERNS_14__split_bufferIjRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE26__swap_out_circular_bufferERNS_14__split_bufferIyRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__19__sift_upIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "_ZThn4_N7android10AllocationD0Ev"
   },
   {
@@ -4304,9 +6544,15 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
+   "name" : "_ZN7android16kEnableRecordingE"
+  },
+  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
+   "name" : "_ZN7android20kEnableRpcDevServersE"
+  },
+  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -4743,6 +6989,10 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android10PoolThreadE"
+  },
+  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -4770,6 +7020,10 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android15BpShellCallbackE"
+  },
+  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -4779,6 +7033,14 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android16BpResultReceiverE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
+  },
+  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -4842,6 +7104,14 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -4910,10 +7180,6 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTVN7android15RpcTransportRawE"
-  },
-  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -4937,10 +7203,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android18RpcTransportCtxRawE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -6475,7 +8737,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -6526,7 +8788,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -10913,6 +13175,104 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemoryHeap>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IShellCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IResultReceiver>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IClientCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceManager>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemory>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
    "function_name" : "android::IMemoryHeap::asInterface",
    "linker_set_key" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE",
    "parameters" :
@@ -13398,6 +15758,849 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::WaitForShutdownListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession23WaitForShutdownListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_12ProcessStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12ProcessStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_12ProcessStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15BpShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android15BpShellCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_16BpResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android16BpResultReceiverE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager::LocalRegistrationCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShimEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android18ServiceManagerShimE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::BufferedTextOutput::BufferState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18BufferedTextOutput11BufferStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os17BpServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os17BpServiceCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::binder::internal::ClientCounterCallbackImpl>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7BBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::clear",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpBinderE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android10AllocationE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpMemoryE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::HeapCache>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_9HeapCacheEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9HeapCacheEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::clear",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h",
+   "template_args" :
+   [
+    "_ZTIN7android10RpcSession23WaitForShutdownListenerE"
+   ]
+  },
+  {
+   "function_name" : "android::wp<android::IBinder::DeathRecipient>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinder14DeathRecipientEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinder14DeathRecipientEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinder14DeathRecipientEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::base::LogMessage::stream",
    "linker_set_key" : "_ZN7android4base10LogMessage6streamEv",
    "parameters" :
@@ -13919,23 +17122,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -13954,22 +17140,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -13986,22 +17156,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
@@ -14650,6 +17804,114 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIa"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIs"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
    "function_name" : "android::base::Readlink",
    "linker_set_key" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_",
    "parameters" :
@@ -14722,6 +17984,114 @@
    "source_file" : "system/libbase/include/android-base/parsebool.h"
   },
   {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIh"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIj"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIt"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::base::ReadFully",
    "linker_set_key" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj",
    "parameters" :
@@ -15002,6 +18372,48 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIxEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIyEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::writeCString",
    "linker_set_key" : "_ZN7android6Parcel12writeCStringEPKc",
    "parameters" :
@@ -15747,19 +19159,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::setServiceFuzzing",
-   "linker_set_key" : "_ZN7android6Parcel17setServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::writeDoubleVector",
    "linker_set_key" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -16867,12 +20266,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
   },
   {
-   "function_name" : "android::binder::LazyServiceRegistrar::createExtraTestInstance",
-   "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv",
-   "return_type" : "_ZTIN7android6binder20LazyServiceRegistrarE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
-  },
-  {
    "function_name" : "android::binder::LazyServiceRegistrar::setActiveServicesCallback",
    "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE",
    "parameters" :
@@ -17667,7 +21060,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -17681,7 +21073,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -19482,7 +22873,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIb",
+   "return_type" : "_ZTIv",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -19628,23 +23019,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android9RpcServerE"
-    },
-    {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "function_name" : "android::RpcServer::setServerSocketModifier",
-   "linker_set_key" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -19652,7 +23027,7 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21568,19 +24943,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::isServiceFuzzing",
-   "linker_set_key" : "_ZNK7android6Parcel16isServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPKN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::readDoubleVector",
    "linker_set_key" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -21671,6 +25033,46 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os15IClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16IServiceCallbackE"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::readUint64Vector",
    "linker_set_key" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -22619,6 +26021,1062 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "function_name" : "android::binder::debug::RecordedTransaction::dumpToFile",
    "linker_set_key" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE",
    "parameters" :
@@ -23449,10 +27907,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA1_KDs",
-   "name" : "const char16_t (&)[1]",
-   "referenced_type" : "_ZTIA1_KDs",
-   "self_type" : "_ZTIRA1_KDs",
+   "linker_set_key" : "_ZTIRA20_KDs",
+   "name" : "const char16_t (&)[20]",
+   "referenced_type" : "_ZTIA20_KDs",
+   "self_type" : "_ZTIRA20_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -23658,7 +28116,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv7-a-neon_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -24358,10 +28816,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -26370,8 +30828,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv7-a-neon_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv7-a-neon_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29014,10 +33472,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -29698,15 +34156,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession> *",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android2wpINS_7BBinderEEE",
    "name" : "android::wp<android::BBinder> *",
    "referenced_type" : "_ZTIN7android2wpINS_7BBinderEEE",
@@ -30337,10 +34786,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -31173,16 +35622,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA1_KDs",
-   "name" : "const char16_t[1]",
-   "referenced_type" : "_ZTIA1_Ds",
-   "self_type" : "_ZTIA1_KDs",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA1_KPKc",
@@ -31193,6 +35632,16 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIA20_KDs",
+   "name" : "const char16_t[20]",
+   "referenced_type" : "_ZTIA20_Ds",
+   "self_type" : "_ZTIA20_KDs",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Ky",
@@ -33441,11 +37890,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -33565,7 +38014,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -34966,46 +39415,6 @@
      "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android15RpcTransportRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportCtxRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android18RpcTransportCtxRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
    "name" : "libutilsinternal::is_complete_type<android::Parcel, void>",
    "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
@@ -46083,15 +50492,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "size" : 12,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "size" : 48,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -49562,7 +53971,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -49612,34 +54021,6 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android10RpcSessionE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android7RefBase12weakref_typeE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android10RpcSessionE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "_ZTIPN7android7BBinderE"
     },
     {
@@ -57122,12 +61503,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -59229,14 +63604,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA1_Ds"
+     "referenced_type" : "_ZTIA20_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -59678,7 +64053,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -59688,32 +64063,26 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServerSocketModifier",
-     "field_offset" : 960,
-     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
-    },
-    {
-     "access" : "private",
      "field_name" : "mSessions",
-     "field_offset" : 1152,
+     "field_offset" : 960,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1248,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1280,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1344,
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -59722,12 +64091,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 192,
+     "component_value" : 168,
      "kind" : "vbase_offset"
     },
     {
@@ -59764,11 +64133,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "offset_to_top"
     },
     {
@@ -60915,10 +65284,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "name" : "std::function<sp<IBinder> (wp<RpcSession>, const void *, unsigned int)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
+   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "name" : "std::function<sp<IBinder> (const void *, unsigned int)> &&",
+   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -60951,15 +65320,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "name" : "std::function<void (borrowed_fd)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "self_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "name" : "std::function<void (LogId, LogSeverity, const char *, const char *, unsigned int, const char *)> &&",
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
diff --git a/34/64/arm/source-based/libc++.so.lsdump b/34/64/arm/source-based/libc++.so.lsdump
index 1bae4a39..3f3f12fb 100644
--- a/34/64/arm/source-based/libc++.so.lsdump
+++ b/34/64/arm/source-based/libc++.so.lsdump
@@ -2596,6 +2596,14 @@
    "name" : "_ZNSt3__112__next_primeEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__112__rs_defaultC1ERKS0_"
   },
   {
@@ -3758,6 +3766,10 @@
    "name" : "_ZNSt3__114__num_put_base18__identify_paddingEPcS1_RKNS_8ios_baseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__114__shared_count12__add_sharedEv"
   },
   {
@@ -4398,10 +4410,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_"
   },
   {
@@ -4417,6 +4453,22 @@
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIssEEPsEEvT0_S5_T_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_"
+  },
+  {
    "name" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE"
   },
   {
@@ -4592,6 +4644,10 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
+  },
+  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -4980,10 +5036,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_"
   },
   {
@@ -5000,10 +5080,50 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_"
   },
   {
@@ -5020,6 +5140,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9802,7 +9938,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_grouping",
+   "function_name" : "std::moneypunct<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9816,7 +9952,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_neg_format",
+   "function_name" : "std::moneypunct<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9830,7 +9966,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_pos_format",
+   "function_name" : "std::moneypunct<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9844,7 +9980,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9858,7 +9994,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_frac_digits",
+   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9872,7 +10008,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_decimal_point",
+   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -9886,7 +10022,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_negative_sign",
+   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -9900,7 +10036,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_positive_sign",
+   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -9914,7 +10050,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10054,7 +10190,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10068,7 +10204,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10082,7 +10218,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10096,7 +10232,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10110,7 +10246,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10124,7 +10260,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10138,7 +10274,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10152,7 +10288,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10166,7 +10302,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13085,7 +13221,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13099,7 +13235,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13113,7 +13249,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13127,7 +13263,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13141,7 +13277,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13155,7 +13291,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13169,7 +13305,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13183,7 +13319,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13197,7 +13333,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13337,7 +13473,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13351,7 +13487,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13365,7 +13501,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13379,7 +13515,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13393,7 +13529,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13407,7 +13543,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13421,7 +13557,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13435,7 +13571,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13449,7 +13585,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20180,6 +20316,50 @@
    "source_file" : "external/libcxx/include/__hash_table"
   },
   {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPcEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPcEE"
+   ]
+  },
+  {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__rs_default::__rs_default",
    "linker_set_key" : "_ZNSt3__112__rs_defaultC1ERKS0_",
    "parameters" :
@@ -25610,6 +25790,25 @@
    "source_file" : "external/libcxx/include/locale"
   },
   {
+   "function_name" : "std::__rotate_right",
+   "linker_set_key" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__shared_count::__add_shared",
    "linker_set_key" : "_ZNSt3__114__shared_count12__add_sharedEv",
    "parameters" :
@@ -28360,7 +28559,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char>::init",
+   "function_name" : "std::moneypunct_byname<char, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28394,7 +28593,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28428,6 +28627,121 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_",
    "parameters" :
    [
@@ -28451,6 +28765,29 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_",
    "parameters" :
    [
@@ -28542,6 +28879,98 @@
    ]
   },
   {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "access" : "private",
    "function_name" : "std::__time_get_storage<char>::init",
    "linker_set_key" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE",
@@ -29353,6 +29782,19 @@
    "source_file" : "external/libcxx/include/memory"
   },
   {
+   "function_name" : "std::mersenne_twister_engine<unsigned int, 32, 624, 397, 31, 2567483615, 11, 4294967295, 7, 2636928640, 15, 4022730752, 18, 1812433253>::operator()",
+   "linker_set_key" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/random"
+  },
+  {
    "function_name" : "std::__libcpp_debug_exception::__libcpp_debug_exception",
    "linker_set_key" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE",
    "parameters" :
@@ -31393,6 +31835,136 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31419,6 +31991,32 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31522,6 +32120,255 @@
    ]
   },
   {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
    "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_",
    "parameters" :
@@ -31552,6 +32399,35 @@
   },
   {
    "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_",
    "parameters" :
    [
@@ -31667,6 +32543,122 @@
    ]
   },
   {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "function_name" : "std::__sort5",
    "linker_set_key" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -34563,13 +35555,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char>::id",
+   "name" : "std::moneypunct<char, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char>::intl",
+   "name" : "std::moneypunct<char, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -34587,13 +35579,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t>::id",
+   "name" : "std::moneypunct<wchar_t, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t>::intl",
+   "name" : "std::moneypunct<wchar_t, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -54141,7 +55133,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54150,7 +55142,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54165,7 +55157,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54174,7 +55166,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54189,7 +55181,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54198,7 +55190,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54213,7 +55205,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54222,7 +55214,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -114267,7 +115259,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -114276,7 +115268,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -134531,7 +135523,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -134541,7 +135533,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000>",
+   "name" : "std::ratio<1000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -134581,7 +135573,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -134591,7 +135583,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -134601,7 +135593,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -135713,7 +136705,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -135722,7 +136714,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135731,7 +136723,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "size" : 1,
@@ -135745,7 +136737,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135754,7 +136746,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135791,7 +136783,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135800,7 +136792,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135837,7 +136829,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135846,7 +136838,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135883,7 +136875,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135892,7 +136884,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135929,7 +136921,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135938,7 +136930,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135975,7 +136967,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -135984,7 +136976,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136053,7 +137045,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "size" : 1,
@@ -136062,7 +137054,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136177,7 +137169,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136186,7 +137178,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
diff --git a/34/64/arm/source-based/libcap.so.lsdump b/34/64/arm/source-based/libcap.so.lsdump
index 97b70a79..31579a59 100644
--- a/34/64/arm/source-based/libcap.so.lsdump
+++ b/34/64/arm/source-based/libcap.so.lsdump
@@ -50,6 +50,9 @@
  "elf_functions" :
  [
   {
+   "name" : "_libcap_strdup"
+  },
+  {
    "name" : "cap_clear"
   },
   {
@@ -77,9 +80,6 @@
    "name" : "cap_fill"
   },
   {
-   "name" : "cap_fill_flag"
-  },
-  {
    "name" : "cap_free"
   },
   {
@@ -122,21 +122,12 @@
    "name" : "cap_get_secbits"
   },
   {
-   "name" : "cap_iab_compare"
-  },
-  {
-   "name" : "cap_iab_dup"
-  },
-  {
    "name" : "cap_iab_fill"
   },
   {
    "name" : "cap_iab_from_text"
   },
   {
-   "name" : "cap_iab_get_pid"
-  },
-  {
    "name" : "cap_iab_get_proc"
   },
   {
@@ -194,9 +185,6 @@
    "name" : "cap_prctlw"
   },
   {
-   "name" : "cap_proc_root"
-  },
-  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -534,27 +522,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_fill_flag",
-   "linker_set_key" : "cap_fill_flag",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    },
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_free",
    "linker_set_key" : "cap_free",
    "parameters" :
@@ -717,33 +684,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_compare",
-   "linker_set_key" : "cap_iab_compare",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    },
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
-   "function_name" : "cap_iab_dup",
-   "linker_set_key" : "cap_iab_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_fill",
    "linker_set_key" : "cap_iab_fill",
    "parameters" :
@@ -777,18 +717,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_get_pid",
-   "linker_set_key" : "cap_iab_get_pid",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_get_proc",
    "linker_set_key" : "cap_iab_get_proc",
    "return_type" : "_ZTIP9cap_iab_s",
@@ -896,7 +824,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -911,7 +839,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -941,7 +869,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -962,7 +890,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -977,7 +905,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1071,18 +999,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_proc_root",
-   "linker_set_key" : "cap_proc_root",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPc",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_reset_ambient",
    "linker_set_key" : "cap_reset_ambient",
    "return_type" : "_ZTIi",
diff --git a/34/64/arm/source-based/libcodec2.so.lsdump b/34/64/arm/source-based/libcodec2.so.lsdump
index 3c7778bb..90236a9c 100644
--- a/34/64/arm/source-based/libcodec2.so.lsdump
+++ b/34/64/arm/source-based/libcodec2.so.lsdump
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1269,7 +1269,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -1285,11 +1285,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -1298,7 +1298,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1755,7 +1755,7 @@
      "name" : "C2FrameData::FLAG_CORRUPT"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
    ],
@@ -2493,7 +2493,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 18446744073709551600,
+     "enum_field_value" : -16,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3619,7 +3619,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3977,7 +3977,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_MASK"
     },
     {
@@ -3989,11 +3989,11 @@
      "name" : "C2Param::CoreIndex::KIND_TUNING"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2Param::CoreIndex::KIND_SETTING"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4281,11 +4281,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -5896,7 +5896,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2Setting::PARAM_KIND"
     }
    ],
@@ -5924,7 +5924,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -5942,7 +5942,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5975,7 +5975,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5990,7 +5990,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6008,7 +6008,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6026,7 +6026,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6053,7 +6053,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6074,7 +6074,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6092,7 +6092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6113,7 +6113,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6137,7 +6137,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6173,7 +6173,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6212,7 +6212,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6248,7 +6248,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6287,7 +6287,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6320,7 +6320,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6338,7 +6338,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6359,7 +6359,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6380,7 +6380,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   }
  ],
  "functions" : [],
@@ -6703,7 +6703,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6712,7 +6712,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6757,7 +6757,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6766,7 +6766,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6946,7 +6946,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7018,7 +7018,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7225,7 +7225,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7234,7 +7234,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7243,7 +7243,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7252,7 +7252,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7261,7 +7261,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7270,7 +7270,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7279,7 +7279,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7288,7 +7288,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7297,7 +7297,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7306,7 +7306,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7315,7 +7315,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7324,7 +7324,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7333,7 +7333,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7342,7 +7342,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7351,7 +7351,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7360,7 +7360,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7369,7 +7369,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7378,7 +7378,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7387,7 +7387,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7414,7 +7414,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7450,7 +7450,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7495,7 +7495,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7783,7 +7783,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7792,7 +7792,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7801,7 +7801,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -8166,7 +8166,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8226,7 +8226,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8276,7 +8276,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9021,7 +9021,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9077,7 +9077,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9561,7 +9561,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10029,7 +10029,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10621,7 +10621,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10988,7 +10988,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/arm/source-based/libcrypto.so.lsdump b/34/64/arm/source-based/libcrypto.so.lsdump
index b5944b73..c1f237f4 100644
--- a/34/64/arm/source-based/libcrypto.so.lsdump
+++ b/34/64/arm/source-based/libcrypto.so.lsdump
@@ -38,6 +38,15 @@
    "source_file" : "external/boringssl/src/include/openssl/cipher.h"
   },
   {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA16_y",
+   "name" : "unsigned long long[16]",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIA16_y",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1808_h",
    "name" : "unsigned char[1808]",
@@ -111,11 +120,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -604,9 +613,6 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
-   "name" : "ASN1_TIME_set_string_X509"
-  },
-  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1858,6 +1864,18 @@
    "name" : "CRYPTO_MUTEX_unlock_write"
   },
   {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_write"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_write"
+  },
+  {
    "name" : "CRYPTO_THREADID_current"
   },
   {
@@ -2608,18 +2626,6 @@
    "name" : "EC_get_builtin_curves"
   },
   {
-   "name" : "EC_group_p224"
-  },
-  {
-   "name" : "EC_group_p256"
-  },
-  {
-   "name" : "EC_group_p384"
-  },
-  {
-   "name" : "EC_group_p521"
-  },
-  {
    "name" : "EC_hash_to_curve_p256_xmd_sha256_sswu"
   },
   {
@@ -3076,15 +3082,6 @@
    "name" : "EVP_HPKE_CTX_seal"
   },
   {
-   "name" : "EVP_HPKE_CTX_setup_auth_recipient"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing"
-  },
-  {
    "name" : "EVP_HPKE_CTX_setup_recipient"
   },
   {
@@ -3520,9 +3517,6 @@
    "name" : "EVP_aead_aes_128_cbc_sha1_tls_implicit_iv"
   },
   {
-   "name" : "EVP_aead_aes_128_cbc_sha256_tls"
-  },
-  {
    "name" : "EVP_aead_aes_128_ccm_bluetooth"
   },
   {
@@ -3742,9 +3736,6 @@
    "name" : "EVP_sha256"
   },
   {
-   "name" : "EVP_sha256_final_with_secret_suffix"
-  },
-  {
    "name" : "EVP_sha384"
   },
   {
@@ -4192,69 +4183,6 @@
    "name" : "OPENSSL_secure_malloc"
   },
   {
-   "name" : "OPENSSL_sk_deep_copy"
-  },
-  {
-   "name" : "OPENSSL_sk_delete"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_if"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_ptr"
-  },
-  {
-   "name" : "OPENSSL_sk_dup"
-  },
-  {
-   "name" : "OPENSSL_sk_find"
-  },
-  {
-   "name" : "OPENSSL_sk_free"
-  },
-  {
-   "name" : "OPENSSL_sk_insert"
-  },
-  {
-   "name" : "OPENSSL_sk_is_sorted"
-  },
-  {
-   "name" : "OPENSSL_sk_new"
-  },
-  {
-   "name" : "OPENSSL_sk_new_null"
-  },
-  {
-   "name" : "OPENSSL_sk_num"
-  },
-  {
-   "name" : "OPENSSL_sk_pop"
-  },
-  {
-   "name" : "OPENSSL_sk_pop_free_ex"
-  },
-  {
-   "name" : "OPENSSL_sk_push"
-  },
-  {
-   "name" : "OPENSSL_sk_set"
-  },
-  {
-   "name" : "OPENSSL_sk_set_cmp_func"
-  },
-  {
-   "name" : "OPENSSL_sk_shift"
-  },
-  {
-   "name" : "OPENSSL_sk_sort"
-  },
-  {
-   "name" : "OPENSSL_sk_value"
-  },
-  {
-   "name" : "OPENSSL_sk_zero"
-  },
-  {
    "name" : "OPENSSL_strcasecmp"
   },
   {
@@ -4861,27 +4789,6 @@
    "name" : "RSA_new_method"
   },
   {
-   "name" : "RSA_new_method_no_e"
-  },
-  {
-   "name" : "RSA_new_private_key"
-  },
-  {
-   "name" : "RSA_new_private_key_large_e"
-  },
-  {
-   "name" : "RSA_new_private_key_no_crt"
-  },
-  {
-   "name" : "RSA_new_private_key_no_e"
-  },
-  {
-   "name" : "RSA_new_public_key"
-  },
-  {
-   "name" : "RSA_new_public_key_large_e"
-  },
-  {
    "name" : "RSA_padding_add_PKCS1_OAEP_mgf1"
   },
   {
@@ -7471,9 +7378,36 @@
    "name" : "s2i_ASN1_OCTET_STRING"
   },
   {
+   "name" : "sk_deep_copy"
+  },
+  {
+   "name" : "sk_delete"
+  },
+  {
+   "name" : "sk_delete_if"
+  },
+  {
+   "name" : "sk_delete_ptr"
+  },
+  {
+   "name" : "sk_dup"
+  },
+  {
+   "name" : "sk_find"
+  },
+  {
    "name" : "sk_free"
   },
   {
+   "name" : "sk_insert"
+  },
+  {
+   "name" : "sk_is_sorted"
+  },
+  {
+   "name" : "sk_new"
+  },
+  {
    "name" : "sk_new_null"
   },
   {
@@ -7492,9 +7426,24 @@
    "name" : "sk_push"
   },
   {
+   "name" : "sk_set"
+  },
+  {
+   "name" : "sk_set_cmp_func"
+  },
+  {
+   "name" : "sk_shift"
+  },
+  {
+   "name" : "sk_sort"
+  },
+  {
    "name" : "sk_value"
   },
   {
+   "name" : "sk_zero"
+  },
+  {
    "name" : "v2i_GENERAL_NAME"
   },
   {
@@ -8559,23 +8508,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8939,30 +8888,6 @@
      "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
     },
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
-   "name" : "int (int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
-    },
-    {
      "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -10463,21 +10388,6 @@
    "source_file" : "external/boringssl/src/include/openssl/asn1.h"
   },
   {
-   "function_name" : "ASN1_TIME_set_string_X509",
-   "linker_set_key" : "ASN1_TIME_set_string_X509",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
    "function_name" : "ASN1_TIME_to_generalizedtime",
    "linker_set_key" : "ASN1_TIME_to_generalizedtime",
    "parameters" :
@@ -16367,21 +16277,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
-   "function_name" : "EC_get_builtin_curves",
-   "linker_set_key" : "EC_get_builtin_curves",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP16EC_builtin_curve"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
    "function_name" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "linker_set_key" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "parameters" :
@@ -17441,135 +17336,6 @@
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
    "function_name" : "EVP_HPKE_CTX_setup_recipient",
    "linker_set_key" : "EVP_HPKE_CTX_setup_recipient",
    "parameters" :
@@ -19454,12 +19220,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "linker_set_key" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -20984,318 +20744,6 @@
    "source_file" : "external/boringssl/src/include/openssl/mem.h"
   },
   {
-   "function_name" : "OPENSSL_sk_deep_copy",
-   "linker_set_key" : "OPENSSL_sk_deep_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPKvE"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete",
-   "linker_set_key" : "OPENSSL_sk_delete",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_if",
-   "linker_set_key" : "OPENSSL_sk_delete_if",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPvS_E"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_ptr",
-   "linker_set_key" : "OPENSSL_sk_delete_ptr",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_dup",
-   "linker_set_key" : "OPENSSL_sk_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_find",
-   "linker_set_key" : "OPENSSL_sk_find",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_free",
-   "linker_set_key" : "OPENSSL_sk_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_insert",
-   "linker_set_key" : "OPENSSL_sk_insert",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_is_sorted",
-   "linker_set_key" : "OPENSSL_sk_is_sorted",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new",
-   "linker_set_key" : "OPENSSL_sk_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new_null",
-   "linker_set_key" : "OPENSSL_sk_new_null",
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_num",
-   "linker_set_key" : "OPENSSL_sk_num",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop",
-   "linker_set_key" : "OPENSSL_sk_pop",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop_free_ex",
-   "linker_set_key" : "OPENSSL_sk_pop_free_ex",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_push",
-   "linker_set_key" : "OPENSSL_sk_push",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set",
-   "linker_set_key" : "OPENSSL_sk_set",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set_cmp_func",
-   "linker_set_key" : "OPENSSL_sk_set_cmp_func",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIPFiPKPKvS2_E",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_shift",
-   "linker_set_key" : "OPENSSL_sk_shift",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_sort",
-   "linker_set_key" : "OPENSSL_sk_sort",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_value",
-   "linker_set_key" : "OPENSSL_sk_value",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_zero",
-   "linker_set_key" : "OPENSSL_sk_zero",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
    "function_name" : "OPENSSL_strcasecmp",
    "linker_set_key" : "OPENSSL_strcasecmp",
    "parameters" :
@@ -27811,10 +27259,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27883,7 +27331,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29899,7 +29347,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30688,7 +30136,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31933,7 +31381,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31954,7 +31402,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -36308,6 +35756,114 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
+   "function_name" : "sk_deep_copy",
+   "linker_set_key" : "sk_deep_copy",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPKvE"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPFvPvES_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPvE"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete",
+   "linker_set_key" : "sk_delete",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_if",
+   "linker_set_key" : "sk_delete_if",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPvS_E"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_ptr",
+   "linker_set_key" : "sk_delete_ptr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_dup",
+   "linker_set_key" : "sk_dup",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_find",
+   "linker_set_key" : "sk_find",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_free",
    "linker_set_key" : "sk_free",
    "parameters" :
@@ -36320,6 +35876,48 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_insert",
+   "linker_set_key" : "sk_insert",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_is_sorted",
+   "linker_set_key" : "sk_is_sorted",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_new",
+   "linker_set_key" : "sk_new",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_new_null",
    "linker_set_key" : "sk_new_null",
    "return_type" : "_ZTIP8stack_st",
@@ -36398,6 +35996,66 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_set",
+   "linker_set_key" : "sk_set",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_set_cmp_func",
+   "linker_set_key" : "sk_set_cmp_func",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIPFiPKPKvS2_E",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_shift",
+   "linker_set_key" : "sk_shift",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_sort",
+   "linker_set_key" : "sk_sort",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_value",
    "linker_set_key" : "sk_value",
    "parameters" :
@@ -36413,6 +36071,18 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_zero",
+   "linker_set_key" : "sk_zero",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "v2i_GENERAL_NAME",
    "linker_set_key" : "v2i_GENERAL_NAME",
    "parameters" :
@@ -37243,6 +36913,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
+   "name" : "bn_mont_ctx_st *",
+   "referenced_type" : "_ZTI14bn_mont_ctx_st",
+   "self_type" : "_ZTIP14bn_mont_ctx_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14private_key_st",
    "name" : "private_key_st *",
    "referenced_type" : "_ZTI14private_key_st",
@@ -37360,15 +37048,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP16EC_builtin_curve",
-   "name" : "EC_builtin_curve *",
-   "referenced_type" : "_ZTI16EC_builtin_curve",
-   "self_type" : "_ZTIP16EC_builtin_curve",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP16HRSS_private_key",
    "name" : "HRSS_private_key *",
    "referenced_type" : "_ZTI16HRSS_private_key",
@@ -38260,10 +37939,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *, const void *)",
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "self_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
+   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38415,15 +38094,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
    "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
-   "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
    "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -38694,15 +38364,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -39484,21 +39145,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKl",
-   "name" : "const long *",
-   "referenced_type" : "_ZTIKl",
-   "self_type" : "_ZTIPKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -39700,6 +39352,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14trust_token_st",
    "name" : "trust_token_st **",
    "referenced_type" : "_ZTIP14trust_token_st",
@@ -40101,7 +39762,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40173,7 +39834,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/bio.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40253,7 +39914,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 480,
+   "size" : 344,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40575,7 +40236,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40595,7 +40256,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 44,
+   "size" : 36,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40995,15 +40656,17 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 76,
+   "size" : 84,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 144,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -41125,22 +40788,12 @@
    "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKl",
-   "name" : "const long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -41393,42 +41046,6 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump"
-    },
-    {
-     "field_name" : "enc_offset",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_AUX_st",
-   "name" : "ASN1_AUX_st",
-   "referenced_type" : "_ZTI11ASN1_AUX_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTI11ASN1_AUX_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "app_data",
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "ref_offset",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "asn1_cb",
-     "field_offset" : 96,
      "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -42578,7 +42195,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42586,7 +42203,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42614,22 +42231,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 5120,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42637,7 +42254,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42930,7 +42547,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIA128_h"
+     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
     },
     {
      "field_name" : "block_used",
@@ -43460,7 +43077,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -43472,7 +43089,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43661,6 +43278,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 288,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 352,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 736,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 768,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 800,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 832,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 864,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 928,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 992,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 20,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPj"
     },
@@ -43941,6 +43801,28 @@
    "source_file" : "external/boringssl/src/include/openssl/kyber.h"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "bytes",
+     "referenced_type" : "_ZTIA128_h"
+    },
+    {
+     "field_name" : "words",
+     "referenced_type" : "_ZTIA16_y"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN16blake2b_state_stUt_E",
+   "name" : "blake2b_state_st::(unnamed)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN16blake2b_state_stUt_E",
+   "self_type" : "_ZTIN16blake2b_state_stUt_E",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 2,
    "fields" :
    [
diff --git a/34/64/arm/source-based/libcrypto_utils.so.lsdump b/34/64/arm/source-based/libcrypto_utils.so.lsdump
index a9ad8f02..ea0189ee 100644
--- a/34/64/arm/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/arm/source-based/libcrypto_utils.so.lsdump
@@ -137,11 +137,13 @@
  "qualified_types" :
  [
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 144,
    "source_file" : "system/core/libcrypto_utils/include/crypto_utils/android_pubkey.h"
   },
   {
diff --git a/34/64/arm/source-based/libcurl.so.lsdump b/34/64/arm/source-based/libcurl.so.lsdump
index 9f96b7ff..7d0984dc 100644
--- a/34/64/arm/source-based/libcurl.so.lsdump
+++ b/34/64/arm/source-based/libcurl.so.lsdump
@@ -112,6 +112,12 @@
    "name" : "Curl_all_content_encodings"
   },
   {
+   "name" : "Curl_alpn_get_proxy_spec"
+  },
+  {
+   "name" : "Curl_alpn_get_spec"
+  },
+  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -202,81 +208,9 @@
    "name" : "Curl_base64url_encode"
   },
   {
-   "name" : "Curl_bufcp_free"
-  },
-  {
-   "name" : "Curl_bufcp_init"
-  },
-  {
-   "name" : "Curl_bufcp_put"
-  },
-  {
-   "name" : "Curl_bufcp_take"
-  },
-  {
    "name" : "Curl_buffer_send"
   },
   {
-   "name" : "Curl_bufq_free"
-  },
-  {
-   "name" : "Curl_bufq_init"
-  },
-  {
-   "name" : "Curl_bufq_init2"
-  },
-  {
-   "name" : "Curl_bufq_initp"
-  },
-  {
-   "name" : "Curl_bufq_is_empty"
-  },
-  {
-   "name" : "Curl_bufq_is_full"
-  },
-  {
-   "name" : "Curl_bufq_len"
-  },
-  {
-   "name" : "Curl_bufq_pass"
-  },
-  {
-   "name" : "Curl_bufq_peek"
-  },
-  {
-   "name" : "Curl_bufq_peek_at"
-  },
-  {
-   "name" : "Curl_bufq_read"
-  },
-  {
-   "name" : "Curl_bufq_reset"
-  },
-  {
-   "name" : "Curl_bufq_sipn"
-  },
-  {
-   "name" : "Curl_bufq_skip"
-  },
-  {
-   "name" : "Curl_bufq_skip_and_shift"
-  },
-  {
-   "name" : "Curl_bufq_slurp"
-  },
-  {
-   "name" : "Curl_bufq_slurpn"
-  },
-  {
-   "name" : "Curl_bufq_space"
-  },
-  {
-   "name" : "Curl_bufq_write"
-  },
-  {
-   "name" : "Curl_bufq_write_pass"
-  },
-  {
    "name" : "Curl_bufref_free"
   },
   {
@@ -346,9 +280,6 @@
    "name" : "Curl_cf_def_send"
   },
   {
-   "name" : "Curl_cf_h1_proxy_insert_after"
-  },
-  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -361,9 +292,6 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
-   "name" : "Curl_cf_http_proxy_get_host"
-  },
-  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -439,13 +367,13 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard_all"
+   "name" : "Curl_conn_cf_discard"
   },
   {
-   "name" : "Curl_conn_cf_discard_chain"
+   "name" : "Curl_conn_cf_discard_all"
   },
   {
-   "name" : "Curl_conn_cf_discard_sub"
+   "name" : "Curl_conn_cf_discard_chain"
   },
   {
    "name" : "Curl_conn_cf_get_select_socks"
@@ -457,9 +385,6 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
-   "name" : "Curl_conn_cf_is_ssl"
-  },
-  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -514,6 +439,9 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
+   "name" : "Curl_conn_http_proxy_add"
+  },
+  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -682,72 +610,6 @@
    "name" : "Curl_dyn_vprintf"
   },
   {
-   "name" : "Curl_dynhds_add"
-  },
-  {
-   "name" : "Curl_dynhds_add_custom"
-  },
-  {
-   "name" : "Curl_dynhds_cadd"
-  },
-  {
-   "name" : "Curl_dynhds_ccontains"
-  },
-  {
-   "name" : "Curl_dynhds_ccount_name"
-  },
-  {
-   "name" : "Curl_dynhds_cget"
-  },
-  {
-   "name" : "Curl_dynhds_contains"
-  },
-  {
-   "name" : "Curl_dynhds_count"
-  },
-  {
-   "name" : "Curl_dynhds_count_name"
-  },
-  {
-   "name" : "Curl_dynhds_cremove"
-  },
-  {
-   "name" : "Curl_dynhds_cset"
-  },
-  {
-   "name" : "Curl_dynhds_free"
-  },
-  {
-   "name" : "Curl_dynhds_get"
-  },
-  {
-   "name" : "Curl_dynhds_getn"
-  },
-  {
-   "name" : "Curl_dynhds_h1_add_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_cadd_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_dprint"
-  },
-  {
-   "name" : "Curl_dynhds_init"
-  },
-  {
-   "name" : "Curl_dynhds_remove"
-  },
-  {
-   "name" : "Curl_dynhds_reset"
-  },
-  {
-   "name" : "Curl_dynhds_set"
-  },
-  {
-   "name" : "Curl_dynhds_set_opts"
-  },
-  {
    "name" : "Curl_expire"
   },
   {
@@ -820,15 +682,6 @@
    "name" : "Curl_gmtime"
   },
   {
-   "name" : "Curl_h1_req_parse_free"
-  },
-  {
-   "name" : "Curl_h1_req_parse_init"
-  },
-  {
-   "name" : "Curl_h1_req_parse_read"
-  },
-  {
    "name" : "Curl_hash_add"
   },
   {
@@ -931,9 +784,6 @@
    "name" : "Curl_http_cookies"
   },
   {
-   "name" : "Curl_http_decode_status"
-  },
-  {
    "name" : "Curl_http_done"
   },
   {
@@ -961,24 +811,6 @@
    "name" : "Curl_http_readwrite_headers"
   },
   {
-   "name" : "Curl_http_req_free"
-  },
-  {
-   "name" : "Curl_http_req_make"
-  },
-  {
-   "name" : "Curl_http_req_make2"
-  },
-  {
-   "name" : "Curl_http_req_to_h2"
-  },
-  {
-   "name" : "Curl_http_resp_free"
-  },
-  {
-   "name" : "Curl_http_resp_make"
-  },
-  {
    "name" : "Curl_http_resume"
   },
   {
@@ -1654,9 +1486,6 @@
    "name" : "Curl_updatesocket"
   },
   {
-   "name" : "Curl_url_set_authority"
-  },
-  {
    "name" : "Curl_urldecode"
   },
   {
@@ -2020,9 +1849,6 @@
    "name" : "Curl_cfree"
   },
   {
-   "name" : "Curl_cft_h1_proxy"
-  },
-  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4430,10 +4256,6 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
-     "enum_field_value" : 3,
-     "name" : "CURLPROXY_HTTPS2"
-    },
-    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/arm/source-based/libdiskconfig.so.lsdump b/34/64/arm/source-based/libdiskconfig.so.lsdump
new file mode 100644
index 00000000..d5b31cfe
--- /dev/null
+++ b/34/64/arm/source-based/libdiskconfig.so.lsdump
@@ -0,0 +1,642 @@
+{
+ "array_types" :
+ [
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA0_h",
+   "name" : "unsigned char[0]",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIA0_h",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA440_h",
+   "name" : "unsigned char[440]",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIA440_h",
+   "size" : 440,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA4_12pc_partition",
+   "name" : "pc_partition[4]",
+   "referenced_type" : "_ZTI12pc_partition",
+   "self_type" : "_ZTIA4_12pc_partition",
+   "size" : 64,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "builtin_types" :
+ [
+  {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIc",
+   "name" : "char",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
+   "size" : 1
+  },
+  {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
+   "alignment" : 4,
+   "is_integral" : true,
+   "linker_set_key" : "_ZTIi",
+   "name" : "int",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
+   "size" : 4
+  },
+  {
+   "alignment" : 4,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIj",
+   "name" : "unsigned int",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
+   "size" : 4
+  },
+  {
+   "alignment" : 2,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIt",
+   "name" : "unsigned short",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
+   "size" : 2
+  },
+  {
+   "linker_set_key" : "_ZTIv",
+   "name" : "void",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
+  },
+  {
+   "alignment" : 8,
+   "is_integral" : true,
+   "linker_set_key" : "_ZTIx",
+   "name" : "long long",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
+   "size" : 8
+  }
+ ],
+ "elf_functions" :
+ [
+  {
+   "name" : "alloc_wl"
+  },
+  {
+   "name" : "apply_disk_config"
+  },
+  {
+   "name" : "config_mbr"
+  },
+  {
+   "name" : "dump_disk_config"
+  },
+  {
+   "name" : "find_mbr_part"
+  },
+  {
+   "name" : "find_part"
+  },
+  {
+   "name" : "find_part_device"
+  },
+  {
+   "name" : "free_wl"
+  },
+  {
+   "name" : "load_diskconfig"
+  },
+  {
+   "name" : "process_disk_config"
+  },
+  {
+   "name" : "wlist_add"
+  },
+  {
+   "name" : "wlist_commit"
+  },
+  {
+   "name" : "wlist_free"
+  },
+  {
+   "name" : "write_raw_image"
+  }
+ ],
+ "elf_objects" : [],
+ "enum_types" : [],
+ "function_types" : [],
+ "functions" :
+ [
+  {
+   "function_name" : "alloc_wl",
+   "linker_set_key" : "alloc_wl",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "apply_disk_config",
+   "linker_set_key" : "apply_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "config_mbr",
+   "linker_set_key" : "config_mbr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "dump_disk_config",
+   "linker_set_key" : "dump_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_mbr_part",
+   "linker_set_key" : "find_mbr_part",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIPc",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_part",
+   "linker_set_key" : "find_part",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIP9part_info",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_part_device",
+   "linker_set_key" : "find_part_device",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIPc",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "free_wl",
+   "linker_set_key" : "free_wl",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "load_diskconfig",
+   "linker_set_key" : "load_diskconfig",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    }
+   ],
+   "return_type" : "_ZTIP9disk_info",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "process_disk_config",
+   "linker_set_key" : "process_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_add",
+   "linker_set_key" : "wlist_add",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPP10write_list"
+    },
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_commit",
+   "linker_set_key" : "wlist_commit",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_free",
+   "linker_set_key" : "wlist_free",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "write_raw_image",
+   "linker_set_key" : "write_raw_image",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "global_vars" : [],
+ "lvalue_reference_types" : [],
+ "pointer_types" :
+ [
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP10write_list",
+   "name" : "write_list *",
+   "referenced_type" : "_ZTI10write_list",
+   "self_type" : "_ZTIP10write_list",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP9disk_info",
+   "name" : "disk_info *",
+   "referenced_type" : "_ZTI9disk_info",
+   "self_type" : "_ZTIP9disk_info",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP9part_info",
+   "name" : "part_info *",
+   "referenced_type" : "_ZTI9part_info",
+   "self_type" : "_ZTIP9part_info",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPKc",
+   "name" : "const char *",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPP10write_list",
+   "name" : "write_list **",
+   "referenced_type" : "_ZTIP10write_list",
+   "self_type" : "_ZTIPP10write_list",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPc",
+   "name" : "char *",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "qualified_types" :
+ [
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIKc",
+   "name" : "const char",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
+   "size" : 1,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "record_types" :
+ [
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "next",
+     "referenced_type" : "_ZTIP10write_list"
+    },
+    {
+     "field_name" : "offset",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "field_name" : "len",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIA0_h"
+    }
+   ],
+   "linker_set_key" : "_ZTI10write_list",
+   "name" : "write_list",
+   "referenced_type" : "_ZTI10write_list",
+   "self_type" : "_ZTI10write_list",
+   "size" : 24,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "status",
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "start",
+     "field_offset" : 8,
+     "referenced_type" : "_ZTI3chs"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "end",
+     "field_offset" : 40,
+     "referenced_type" : "_ZTI3chs"
+    },
+    {
+     "field_name" : "start_lba",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "len_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI12pc_partition",
+   "name" : "pc_partition",
+   "referenced_type" : "_ZTI12pc_partition",
+   "self_type" : "_ZTI12pc_partition",
+   "size" : 16,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "code",
+     "referenced_type" : "_ZTIA440_h"
+    },
+    {
+     "field_name" : "disk_sig",
+     "field_offset" : 3520,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "pad",
+     "field_offset" : 3552,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "field_name" : "ptable",
+     "field_offset" : 3568,
+     "referenced_type" : "_ZTIA4_12pc_partition"
+    },
+    {
+     "field_name" : "mbr_sig",
+     "field_offset" : 4080,
+     "referenced_type" : "_ZTIt"
+    }
+   ],
+   "linker_set_key" : "_ZTI14pc_boot_record",
+   "name" : "pc_boot_record",
+   "referenced_type" : "_ZTI14pc_boot_record",
+   "self_type" : "_ZTI14pc_boot_record",
+   "size" : 512,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "head",
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "sector",
+     "field_offset" : 8,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "cylinder",
+     "field_offset" : 16,
+     "referenced_type" : "_ZTIh"
+    }
+   ],
+   "linker_set_key" : "_ZTI3chs",
+   "name" : "chs",
+   "referenced_type" : "_ZTI3chs",
+   "self_type" : "_ZTI3chs",
+   "size" : 3,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "device",
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "field_name" : "scheme",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "sect_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "skip_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "num_lba",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "part_lst",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9part_info"
+    },
+    {
+     "field_name" : "num_parts",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTI9disk_info",
+   "name" : "disk_info",
+   "referenced_type" : "_ZTI9disk_info",
+   "self_type" : "_ZTI9disk_info",
+   "size" : 28,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 40,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "len_kb",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "start_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI9part_info",
+   "name" : "part_info",
+   "referenced_type" : "_ZTI9part_info",
+   "self_type" : "_ZTI9part_info",
+   "size" : 16,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "rvalue_reference_types" : []
+}
diff --git a/34/64/arm/source-based/libdmabufheap.so.lsdump b/34/64/arm/source-based/libdmabufheap.so.lsdump
index bbfc72b5..78752eea 100644
--- a/34/64/arm/source-based/libdmabufheap.so.lsdump
+++ b/34/64/arm/source-based/libdmabufheap.so.lsdump
@@ -1502,7 +1502,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1553,7 +1553,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
diff --git a/34/64/arm/source-based/libdumpstateutil.so.lsdump b/34/64/arm/source-based/libdumpstateutil.so.lsdump
index b7871349..b5b80eff 100644
--- a/34/64/arm/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/arm/source-based/libdumpstateutil.so.lsdump
@@ -153,9 +153,6 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -205,9 +202,6 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -580,12 +574,6 @@
    "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
   },
   {
-   "function_name" : "android::os::dumpstate::PropertiesHelper::IsStrictRun",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv",
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
    "function_name" : "android::os::dumpstate::PropertiesHelper::IsUserBuild",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv",
    "return_type" : "_ZTIb",
@@ -724,13 +712,6 @@
   },
   {
    "access" : "private",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E",
-   "name" : "android::os::dumpstate::PropertiesHelper::strict_run_",
-   "referenced_type" : "_ZTIi",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
-   "access" : "private",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E",
    "name" : "android::os::dumpstate::PropertiesHelper::parallel_run_",
    "referenced_type" : "_ZTIi",
diff --git a/34/64/arm/source-based/libgralloctypes.so.lsdump b/34/64/arm/source-based/libgralloctypes.so.lsdump
index dc63f8bd..6162edad 100644
--- a/34/64/arm/source-based/libgralloctypes.so.lsdump
+++ b/34/64/arm/source-based/libgralloctypes.so.lsdump
@@ -2877,11 +2877,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3468,11 +3468,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4053,11 +4053,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm/source-based/libhardware.so.lsdump b/34/64/arm/source-based/libhardware.so.lsdump
index e7be0794..263dbf19 100644
--- a/34/64/arm/source-based/libhardware.so.lsdump
+++ b/34/64/arm/source-based/libhardware.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -936,7 +936,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -957,7 +957,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -975,7 +975,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -993,7 +993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "global_vars" : [],
@@ -1007,7 +1007,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1016,7 +1016,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1034,7 +1034,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1061,7 +1061,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1079,7 +1079,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1088,7 +1088,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1119,7 +1119,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1168,7 +1168,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1224,7 +1224,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1415,7 +1415,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/arm/source-based/libhidlbase.so.lsdump b/34/64/arm/source-based/libhidlbase.so.lsdump
index 2760fbc1..74efb8ad 100644
--- a/34/64/arm/source-based/libhidlbase.so.lsdump
+++ b/34/64/arm/source-based/libhidlbase.so.lsdump
@@ -264,6 +264,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -276,6 +284,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -288,6 +300,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -296,11 +312,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
@@ -1874,6 +1890,22 @@
    "name" : "_ZN7android8hardware21writeEmbeddedToParcelERKNS0_11hidl_stringEPNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware22configureRpcThreadpoolEjb"
   },
   {
@@ -1889,6 +1921,22 @@
    "name" : "_ZN7android8hardware22readEmbeddedFromParcelERKNS0_11hidl_stringERKNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE"
   },
   {
@@ -2350,6 +2398,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
   },
   {
@@ -2753,6 +2821,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE18__lookup_classnameIPKcEEtT_S5_bc"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__112regex_traitsIcE19__transform_primaryINS_11__wrap_iterIPcEEEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SC_c"
   },
   {
@@ -2769,6 +2841,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2829,6 +2905,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEERKT_"
   },
   {
@@ -2837,6 +2917,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2845,15 +2929,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
   },
   {
    "binding" : "weak",
@@ -2869,10 +2957,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__parse_BACKREFIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__push_back_refEi"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ORD_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ecma_expIPKcEET_S7_S7_"
   },
   {
@@ -2889,6 +2985,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_simple_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_ERE_branchIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_awk_escapeIPKcEET_S7_S7_PNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -2925,6 +3029,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2969,10 +3077,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE25__parse_pattern_characterIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE26__parse_bracket_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2989,6 +3093,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__parse_one_char_or_coll_elem_EREIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__push_begin_marked_subexpressionEv"
   },
   {
@@ -2997,10 +3105,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE3endEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE5clearEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEE3endEv"
   },
   {
@@ -3009,6 +3129,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112regex_traitsIcE6__initEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -3017,14 +3145,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS_6vectorIPKcNS_9allocatorISA_EEEEEENSB_ISE_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3037,6 +3181,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3045,6 +3193,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE11__read_modeEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE4openEPKcj"
   },
   {
@@ -3097,19 +3253,51 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEEC2EjjS8_"
+   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEEC2EjjSA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEEC2EjjSA_"
+   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIccEERNS_9allocatorIS2_EEEC2EjjS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIccEERNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEEC2EjjS7_"
   },
   {
    "binding" : "weak",
@@ -3117,6 +3305,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchINS_11__wrap_iterIPKcEEEERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchINS_11__wrap_iterIPKcEEEERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_9sub_matchIPKcEERNS_9allocatorIS4_EEEC2EjjS7_"
   },
   {
@@ -3137,6 +3333,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3145,6 +3345,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3153,11 +3357,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
@@ -3165,6 +3369,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -3229,10 +3437,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS1_8hardware9SchedPrioENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_S9_EEEEEixERSE_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEEbNS_4lessIS7_EENS_9allocatorINS_4pairIKS7_bEEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS4_IiEEEENS8_IS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSE_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_4hidl4base4V1_05IBaseEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SH_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_8hardware7IBinderEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SF_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapIPKN7android4hidl4base4V1_05IBaseENS1_2wpINS1_8hardware9BHwBinderEEENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_SB_EEEEEixERSG_"
   },
   {
@@ -3269,18 +3493,70 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISN_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE14__erase_uniqueIS8_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_10unique_ptrINS_11__tree_nodeISB_PvEENS_22__tree_node_destructorINSG_ISV_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE4findIS8_EENS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE5eraseENS_21__tree_const_iteratorISB_PNS_11__tree_nodeISB_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS9_PvEENS_22__tree_node_destructorINSE_IST_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE5eraseENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSP_SP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE25__emplace_unique_key_argsIS7_JS7_SD_EEENS_4pairINS_15__tree_iteratorISE_PNS_11__tree_nodeISE_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3297,6 +3573,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3309,7 +3589,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
@@ -3325,6 +3609,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISE_EEEERSR_SR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -3345,15 +3637,19 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE5eraseENS_21__tree_const_iteratorISD_PNS_11__tree_nodeISD_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
@@ -3369,6 +3665,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3381,6 +3685,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS0_IPKcNS_9allocatorIS9_EEEEEENSA_ISD_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -3389,6 +3697,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIccEENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
   },
   {
@@ -3413,10 +3733,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE6resizeEj"
   },
   {
@@ -3457,10 +3785,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE21__push_back_slow_pathIS1_EEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE21__push_back_slow_pathIRKcEEvOT_"
   },
   {
@@ -3469,6 +3809,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2INS_21__tree_const_iteratorIiPNS_11__tree_nodeIiPvEEiEEEET_NS_9enable_ifIXaasr21__is_forward_iteratorISB_EE5valuesr16is_constructibleIiNS_15iterator_traitsISB_E9referenceEEE5valueESB_E4typeE"
   },
   {
@@ -3477,6 +3825,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3765,6 +4117,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -3796,6 +4152,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -3881,6 +4241,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4028,6 +4392,10 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
+  },
+  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4037,6 +4405,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4046,6 +4418,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4072,6 +4448,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8456,6 +8836,42 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::base::V1_0::IBase>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl4base4V1_05IBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl4base4V1_05IBaseEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_215IServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_",
    "parameters" :
@@ -8504,6 +8920,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_",
    "parameters" :
@@ -8553,6 +8985,22 @@
   },
   {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE",
    "parameters" :
    [
@@ -8585,35 +9033,35 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "function_name" : "android::sp<android::hardware::hidl_binder_death_recipient>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     },
     {
-     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
     },
     {
-     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -16947,6 +17395,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::configureRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware22configureRpcThreadpoolEjb",
    "parameters" :
@@ -17037,6 +17597,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::getOrCreateCachedBinder",
    "linker_set_key" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE",
    "parameters" :
@@ -19051,6 +19723,91 @@
   },
   {
    "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
    "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
    "parameters" :
    [
@@ -21420,8 +22177,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv7-a-neon_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv7-a-neon_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -22771,7 +23528,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv7-a-neon_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/34/64/arm/source-based/libmedia_helper.so.lsdump b/34/64/arm/source-based/libmedia_helper.so.lsdump
index ae131fb1..2a372d86 100644
--- a/34/64/arm/source-based/libmedia_helper.so.lsdump
+++ b/34/64/arm/source-based/libmedia_helper.so.lsdump
@@ -668,33 +668,21 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10valueHacOnE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
-   "name" : "_ZN7android14AudioParameter11valueHacOffE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
-   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -716,15 +704,6 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -734,9 +713,6 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
-   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1450,24 +1426,12 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10keyTtyModeE",
-   "name" : "android::AudioParameter::keyTtyMode",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter10valueFalseE",
    "name" : "android::AudioParameter::valueFalse",
    "referenced_type" : "_ZTIKPKc",
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10valueHacOnE",
-   "name" : "android::AudioParameter::valueHacOn",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter11keyChannelsE",
    "name" : "android::AudioParameter::keyChannels",
    "referenced_type" : "_ZTIKPKc",
@@ -1480,12 +1444,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter11valueHacOffE",
-   "name" : "android::AudioParameter::valueHacOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter12keyProgramIdE",
    "name" : "android::AudioParameter::keyProgramId",
    "referenced_type" : "_ZTIKPKc",
@@ -1498,12 +1456,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter13keyHacSettingE",
-   "name" : "android::AudioParameter::keyHacSetting",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter13keyMonoOutputE",
    "name" : "android::AudioParameter::keyMonoOutput",
    "referenced_type" : "_ZTIKPKc",
@@ -1546,24 +1498,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeHcoE",
-   "name" : "android::AudioParameter::valueTtyModeHco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeOffE",
-   "name" : "android::AudioParameter::valueTtyModeOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeVcoE",
-   "name" : "android::AudioParameter::valueTtyModeVco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter16keyBtLeSuspendedE",
    "name" : "android::AudioParameter::keyBtLeSuspended",
    "referenced_type" : "_ZTIKPKc",
@@ -1582,12 +1516,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter16valueTtyModeFullE",
-   "name" : "android::AudioParameter::valueTtyModeFull",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter17keyPresentationIdE",
    "name" : "android::AudioParameter::keyPresentationId",
    "referenced_type" : "_ZTIKPKc",
diff --git a/34/64/arm/source-based/libmedia_omx.so.lsdump b/34/64/arm/source-based/libmedia_omx.so.lsdump
index 97779e6c..449d96ab 100644
--- a/34/64/arm/source-based/libmedia_omx.so.lsdump
+++ b/34/64/arm/source-based/libmedia_omx.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5549,7 +5549,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5565,11 +5565,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5578,7 +5578,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5921,7 +5921,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5937,71 +5937,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10606,11 +10606,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11197,11 +11197,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11782,11 +11782,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12745,7 +12745,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12763,7 +12763,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12796,7 +12796,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12811,7 +12811,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12829,7 +12829,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12847,7 +12847,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12874,7 +12874,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12919,7 +12919,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12937,7 +12937,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12958,7 +12958,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12982,7 +12982,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13018,7 +13018,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13057,7 +13057,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13093,7 +13093,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13132,7 +13132,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13165,7 +13165,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13183,7 +13183,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13219,7 +13219,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13240,7 +13240,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17011,7 +17011,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17020,7 +17020,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17047,7 +17047,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17074,7 +17074,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17101,7 +17101,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17119,7 +17119,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17236,7 +17236,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17245,7 +17245,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17254,7 +17254,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17263,7 +17263,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17272,7 +17272,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17281,7 +17281,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17290,7 +17290,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17308,7 +17308,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17317,7 +17317,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17326,7 +17326,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17335,7 +17335,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17344,7 +17344,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17353,7 +17353,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17362,7 +17362,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17371,7 +17371,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17380,7 +17380,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17389,7 +17389,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17407,7 +17407,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17416,7 +17416,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17443,7 +17443,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17461,7 +17461,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18887,15 +18887,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "_ZTIN7android12LightRefBaseINS_5FenceEEE",
-   "self_type" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android12NativeHandleE",
    "name" : "android::NativeHandle *",
    "referenced_type" : "_ZTIN7android12NativeHandleE",
@@ -19004,15 +18995,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "_ZTIN7android19FenceToFenceTimeMapE",
-   "self_type" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -20359,7 +20341,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20386,7 +20368,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20566,7 +20548,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20596,7 +20578,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22371,13 +22353,11 @@
    "source_file" : "frameworks/av/media/libmedia/include/media/MediaCodecBuffer.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
    "name" : "const std::shared_ptr<android::FenceTime>",
    "referenced_type" : "_ZTINSt3__110shared_ptrIN7android9FenceTimeEEE",
    "self_type" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
-   "size" : 8,
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -23185,7 +23165,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23241,7 +23221,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23426,7 +23406,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23570,7 +23550,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23863,7 +23843,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24245,7 +24225,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35364,12 +35344,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43474,15 +43448,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ALooperEEE",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ALooperEEE",
diff --git a/34/64/arm/source-based/libprocessgroup.so.lsdump b/34/64/arm/source-based/libprocessgroup.so.lsdump
index 437b7411..87c11b16 100644
--- a/34/64/arm/source-based/libprocessgroup.so.lsdump
+++ b/34/64/arm/source-based/libprocessgroup.so.lsdump
@@ -146,9 +146,6 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
-   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
-  },
-  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -250,7 +247,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1138,15 +1135,9 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1162,15 +1153,9 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1183,18 +1168,12 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1222,42 +1201,21 @@
    "name" : "_ZNK16ProfileAttribute14GetPathForTaskEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZNK16ProfileAttribute17GetPathForProcessEjiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
-   "name" : "_ZNK16ProfileAttribute9file_nameEv"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction13ExecuteForUIDEj"
   },
   {
    "name" : "_ZNK18SetAttributeAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18SetAttributeAction14IsValidForTaskEi"
-  },
-  {
-   "name" : "_ZNK18SetAttributeAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18SetAttributeAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK19SetTimerSlackAction14ExecuteForTaskEi"
   },
   {
diff --git a/34/64/arm/source-based/libsqlite.so.lsdump b/34/64/arm/source-based/libsqlite.so.lsdump
index 4282a1df..4e718747 100644
--- a/34/64/arm/source-based/libsqlite.so.lsdump
+++ b/34/64/arm/source-based/libsqlite.so.lsdump
@@ -337,9 +337,6 @@
    "name" : "sqlite3_interrupt"
   },
   {
-   "name" : "sqlite3_is_interrupted"
-  },
-  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -694,9 +691,6 @@
    "name" : "sqlite3_value_dup"
   },
   {
-   "name" : "sqlite3_value_encoding"
-  },
-  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/arm/source-based/libssl.so.lsdump b/34/64/arm/source-based/libssl.so.lsdump
index ba49978c..68b05f4d 100644
--- a/34/64/arm/source-based/libssl.so.lsdump
+++ b/34/64/arm/source-based/libssl.so.lsdump
@@ -20,15 +20,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA13_22SignatureAlgorithmName",
-   "name" : "SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1424_h",
    "name" : "unsigned char[1424]",
@@ -74,15 +65,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA24_13ssl_cipher_st",
-   "name" : "ssl_cipher_st[24]",
-   "referenced_type" : "_ZTI13ssl_cipher_st",
-   "self_type" : "_ZTIA24_13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA24_h",
    "name" : "unsigned char[24]",
@@ -137,15 +119,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA3_PKc",
-   "name" : "const char *[3]",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIA3_PKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "linker_set_key" : "_ZTIA3_t",
    "name" : "unsigned short[3]",
@@ -192,11 +165,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -227,24 +200,6 @@
    "source_file" : "external/boringssl/src/include/openssl/sha.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl10NamedGroupE",
-   "name" : "bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIN4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl11VersionInfoE",
-   "name" : "bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA7776_h",
    "name" : "unsigned char[7776]",
@@ -557,9 +512,6 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
-   "name" : "SSL_CIPHER_get_handshake_digest"
-  },
-  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -584,6 +536,9 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
+   "name" : "SSL_CIPHER_get_value"
+  },
+  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -848,9 +803,6 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
-   "name" : "SSL_CTX_set1_group_ids"
-  },
-  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1412,24 +1364,6 @@
    "name" : "SSL_get_SSL_CTX"
   },
   {
-   "name" : "SSL_get_all_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_curve_names"
-  },
-  {
-   "name" : "SSL_get_all_group_names"
-  },
-  {
-   "name" : "SSL_get_all_signature_algorithm_names"
-  },
-  {
-   "name" : "SSL_get_all_standard_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_version_names"
-  },
-  {
    "name" : "SSL_get_certificate"
   },
   {
@@ -1490,12 +1424,6 @@
    "name" : "SSL_get_finished"
   },
   {
-   "name" : "SSL_get_group_id"
-  },
-  {
-   "name" : "SSL_get_group_name"
-  },
-  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1517,9 +1445,6 @@
    "name" : "SSL_get_mode"
   },
   {
-   "name" : "SSL_get_negotiated_group"
-  },
-  {
    "name" : "SSL_get_options"
   },
   {
@@ -1790,9 +1715,6 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
-   "name" : "SSL_set1_group_ids"
-  },
-  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2171,9 +2093,6 @@
    "name" : "_ZN4bssl24ssl_cert_check_key_usageEPK6cbs_stNS_15ssl_key_usage_tE"
   },
   {
-   "name" : "_ZN4bssl24ssl_cipher_is_deprecatedEPK13ssl_cipher_st"
-  },
-  {
    "name" : "_ZN4bssl28ssl_is_valid_ech_public_nameENS_4SpanIKhEE"
   },
   {
@@ -6781,18 +6700,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CIPHER_get_handshake_digest",
-   "linker_set_key" : "SSL_CIPHER_get_handshake_digest",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK13ssl_cipher_st"
-    }
-   ],
-   "return_type" : "_ZTIPK9env_md_st",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CIPHER_get_id",
    "linker_set_key" : "SSL_CIPHER_get_id",
    "parameters" :
@@ -6889,6 +6796,18 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CIPHER_get_value",
+   "linker_set_key" : "SSL_CIPHER_get_value",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK13ssl_cipher_st"
+    }
+   ],
+   "return_type" : "_ZTIt",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CIPHER_get_version",
    "linker_set_key" : "SSL_CIPHER_get_version",
    "parameters" :
@@ -8047,24 +7966,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CTX_set1_group_ids",
-   "linker_set_key" : "SSL_CTX_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP10ssl_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CTX_set1_groups",
    "linker_set_key" : "SSL_CTX_set1_groups",
    "parameters" :
@@ -10900,96 +10801,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_all_cipher_names",
-   "linker_set_key" : "SSL_get_all_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_curve_names",
-   "linker_set_key" : "SSL_get_all_curve_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_group_names",
-   "linker_set_key" : "SSL_get_all_group_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_signature_algorithm_names",
-   "linker_set_key" : "SSL_get_all_signature_algorithm_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_standard_cipher_names",
-   "linker_set_key" : "SSL_get_all_standard_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_version_names",
-   "linker_set_key" : "SSL_get_all_version_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_certificate",
    "linker_set_key" : "SSL_get_certificate",
    "parameters" :
@@ -11257,30 +11068,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_group_id",
-   "linker_set_key" : "SSL_get_group_id",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIt",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_group_name",
-   "linker_set_key" : "SSL_get_group_name",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIt"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_info_callback",
    "linker_set_key" : "SSL_get_info_callback",
    "parameters" :
@@ -11374,18 +11161,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_negotiated_group",
-   "linker_set_key" : "SSL_get_negotiated_group",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_options",
    "linker_set_key" : "SSL_get_options",
    "parameters" :
@@ -12643,24 +12418,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_set1_group_ids",
-   "linker_set_key" : "SSL_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP6ssl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_set1_groups",
    "linker_set_key" : "SSL_set1_groups",
    "parameters" :
@@ -14487,15 +14244,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName (&)[13]",
-   "referenced_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "self_type" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA16_Kh",
    "name" : "const unsigned char (&)[16]",
    "referenced_type" : "_ZTIA16_Kh",
@@ -14523,15 +14271,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st (&)[24]",
-   "referenced_type" : "_ZTIA24_K13ssl_cipher_st",
-   "self_type" : "_ZTIRA24_K13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA2_Kh",
    "name" : "const unsigned char (&)[2]",
    "referenced_type" : "_ZTIA2_Kh",
@@ -14577,15 +14316,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_KPKc",
-   "name" : "const char *const (&)[3]",
-   "referenced_type" : "_ZTIA3_KPKc",
-   "self_type" : "_ZTIRA3_KPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA3_Kt",
    "name" : "const unsigned short (&)[3]",
    "referenced_type" : "_ZTIA3_Kt",
@@ -14595,15 +14325,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_PKc",
-   "name" : "const char *(&)[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIRA3_PKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA4_Kh",
    "name" : "const unsigned char (&)[4]",
    "referenced_type" : "_ZTIA4_Kh",
@@ -14622,24 +14343,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA8_Kh",
    "name" : "const unsigned char (&)[8]",
    "referenced_type" : "_ZTIA8_Kh",
@@ -14667,24 +14370,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK13ssl_cipher_st",
-   "name" : "const ssl_cipher_st &",
-   "referenced_type" : "_ZTIK13ssl_cipher_st",
-   "self_type" : "_ZTIRK13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName &",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIRK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRK6cbs_st",
    "name" : "const cbs_st &",
    "referenced_type" : "_ZTIK6cbs_st",
@@ -14694,33 +14379,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup &",
-   "referenced_type" : "_ZTIKN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRKN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo &",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> &",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> &",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -14874,15 +14532,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKPKc",
-   "name" : "const char *const &",
-   "referenced_type" : "_ZTIKPKc",
-   "self_type" : "_ZTIRKPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKh",
    "name" : "const unsigned char &",
    "referenced_type" : "_ZTIKh",
@@ -14973,15 +14622,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRPKc",
-   "name" : "const char *&",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIRPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRh",
    "name" : "unsigned char &",
    "referenced_type" : "_ZTIh",
@@ -15102,6 +14742,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP11rsa_meth_st",
+   "name" : "rsa_meth_st *",
+   "referenced_type" : "_ZTI11rsa_meth_st",
+   "self_type" : "_ZTIP11rsa_meth_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ssl_comp_st",
    "name" : "ssl_comp_st *",
    "referenced_type" : "_ZTI11ssl_comp_st",
@@ -15345,6 +14994,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
    "name" : "bn_mont_ctx_st *",
    "referenced_type" : "_ZTI14bn_mont_ctx_st",
@@ -18567,15 +18225,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName *",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIPK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK22ssl_early_callback_ctx",
    "name" : "const ssl_early_callback_ctx *",
    "referenced_type" : "_ZTIK22ssl_early_callback_ctx",
@@ -18819,15 +18468,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo *",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIPKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIK13ssl_cipher_stEE",
    "name" : "const bssl::Span<const ssl_cipher_st> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIK13ssl_cipher_stEE",
@@ -18837,15 +18477,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -18855,24 +18486,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKbEE",
@@ -18918,15 +18531,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -19503,15 +19107,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -19521,24 +19116,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKbEE",
    "name" : "bssl::Span<const bool> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -19584,15 +19161,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIhEE",
    "name" : "bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -19755,6 +19323,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14ssl_session_st",
    "name" : "ssl_session_st **",
    "referenced_type" : "_ZTIP14ssl_session_st",
@@ -19787,7 +19364,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19823,7 +19400,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -19893,16 +19470,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA16_Kh",
@@ -19933,16 +19500,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st[24]",
-   "referenced_type" : "_ZTIA24_13ssl_cipher_st",
-   "self_type" : "_ZTIA24_K13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA2_Kh",
@@ -19983,16 +19540,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA3_KPKc",
-   "name" : "const char *const[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIA3_KPKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "_ZTIA3_Kt",
@@ -20023,26 +19570,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA8_Kh",
@@ -20343,7 +19870,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20669,16 +20196,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIK22SignatureAlgorithmName",
-   "size" : 26,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK22ssl_early_callback_ctx",
@@ -20851,11 +20368,13 @@
    "source_file" : "external/boringssl/src/include/openssl/bytestring.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 144,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -20907,17 +20426,7 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 72,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIKN4bssl11VersionInfoE",
-   "size" : 8,
+   "size" : 32,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20933,16 +20442,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName>",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup>",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -20953,26 +20452,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool>",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -21023,16 +20502,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *>",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char>",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -21077,7 +20546,7 @@
    "name" : "const bssl::internal::StackAllocated<evp_aead_ctx_st, void, &EVP_AEAD_CTX_zero, &EVP_AEAD_CTX_cleanup>",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIKN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22866,7 +22335,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22874,7 +22343,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22902,22 +22371,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 5120,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22925,7 +22394,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23691,7 +23160,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -23703,7 +23172,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -24030,6 +23499,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 288,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 352,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 736,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 768,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 800,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 832,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 864,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 928,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 992,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 20,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPj"
     },
@@ -24438,41 +24150,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPK22SignatureAlgorithmName"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE"
     }
    ],
@@ -24508,76 +24185,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKN4bssl11VersionInfoE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKbEE"
     }
    ],
@@ -24753,41 +24360,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKhEE"
     }
    ],
@@ -26473,7 +26045,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26496,7 +26068,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26761,20 +26333,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::internal::SpanBase<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE",
    "name" : "bssl::internal::SpanBase<const bssl::NamedGroup>",
    "record_kind" : "class",
@@ -26789,34 +26347,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "name" : "bssl::internal::SpanBase<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "name" : "bssl::internal::SpanBase<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKbEE",
    "name" : "bssl::internal::SpanBase<const bool>",
    "record_kind" : "class",
diff --git a/34/64/arm/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/arm/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 95490f4b..3e99ca8c 100644
--- a/34/64/arm/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -5435,7 +5435,7 @@
    "name" : "const android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIKN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -5465,7 +5465,7 @@
    "name" : "const android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIKN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6718,19 +6718,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6821,19 +6815,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9096,7 +9084,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9115,7 +9103,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/arm/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/arm/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 1e7b46a2..42b7a77c 100644
--- a/34/64/arm/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -983,9 +983,6 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
-   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -11701,11 +11698,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12292,11 +12289,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12877,11 +12874,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14474,37 +14471,6 @@
   },
   {
    "function_name" : "android::GraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android19GraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_16ComponentWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::GraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy",
    "parameters" :
    [
diff --git a/34/64/arm/source-based/libstagefright_foundation.so.lsdump b/34/64/arm/source-based/libstagefright_foundation.so.lsdump
index 8470613a..c3f8aa50 100644
--- a/34/64/arm/source-based/libstagefright_foundation.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_foundation.so.lsdump
@@ -24051,7 +24051,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv7-a-neon_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv7-a-neon_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -24093,13 +24093,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv7-a-neon_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv7-a-neon_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv7-a-neon_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv7-a-neon_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/34/64/arm/source-based/libstagefright_omx.so.lsdump b/34/64/arm/source-based/libstagefright_omx.so.lsdump
index e9fdab92..429b7f8b 100644
--- a/34/64/arm/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_omx.so.lsdump
@@ -643,9 +643,6 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
-   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -15372,37 +15369,6 @@
   },
   {
    "function_name" : "android::OmxGraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android22OmxGraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_15IOmxNodeWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::OmxGraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy",
    "parameters" :
    [
@@ -43282,15 +43248,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ABufferEEE",
    "name" : "android::sp<android::ABuffer> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ABufferEEE",
diff --git a/34/64/arm/source-based/libstagefright_omx_utils.so.lsdump b/34/64/arm/source-based/libstagefright_omx_utils.so.lsdump
index c6dec2f7..b894d827 100644
--- a/34/64/arm/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_omx_utils.so.lsdump
@@ -9854,11 +9854,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24586,12 +24586,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/arm/source-based/libtinyalsa.so.lsdump b/34/64/arm/source-based/libtinyalsa.so.lsdump
index 1480e65f..af0870a6 100644
--- a/34/64/arm/source-based/libtinyalsa.so.lsdump
+++ b/34/64/arm/source-based/libtinyalsa.so.lsdump
@@ -219,9 +219,6 @@
    "name" : "pcm_get_subdevice"
   },
   {
-   "name" : "pcm_get_xruns"
-  },
-  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1302,18 +1299,6 @@
    "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
   },
   {
-   "function_name" : "pcm_get_xruns",
-   "linker_set_key" : "pcm_get_xruns",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP3pcm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
-  },
-  {
    "function_name" : "pcm_ioctl",
    "linker_set_key" : "pcm_ioctl",
    "parameters" :
diff --git a/34/64/arm/source-based/libui.so.lsdump b/34/64/arm/source-based/libui.so.lsdump
index 955d6e9e..dca11b4a 100644
--- a/34/64/arm/source-based/libui.so.lsdump
+++ b/34/64/arm/source-based/libui.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -860,6 +860,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -868,10 +872,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1202,10 +1214,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1446,6 +1454,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1454,9 +1466,21 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS9_8hidl_vecIhEEPT_ESS_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS8_20StandardMetadataTypeEPFiRKNSD_8hidl_vecIhEEPT_ESR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIjEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIyEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper18validateBufferSizeEPK13native_handlejjijyj"
   },
   {
@@ -1484,6 +1508,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1500,6 +1528,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1519,6 +1551,10 @@
    "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalIN4aidl7android8hardware8graphics6common9Smpte2086EEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSO_PNSE_8hidl_vecIhEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSM_PNSC_8hidl_vecIhEEE"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper4lockEPK13native_handleyRKNS_4RectEiP13android_ycbcr"
   },
   {
@@ -2307,6 +2343,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE14__erase_uniqueIS4_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE25__emplace_unique_key_argsIS4_JRKNS_21piecewise_construct_tENS_5tupleIJOS4_EEENSR_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeISC_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -2335,6 +2375,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2343,15 +2387,31 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113unordered_mapIPN7android5FenceENS_6vectorINS_8weak_ptrINS1_9FenceTimeEEENS_9allocatorIS7_EEEENS_4hashIS3_EENS_8equal_toIS3_EENS8_INS_4pairIKS3_SA_EEEEEixEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -2359,6 +2419,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS4_EEEC2EjjS7_"
   },
   {
@@ -2387,6 +2455,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2435,14 +2507,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEEC2Ej"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware6common12NativeHandleENS_9allocatorIS5_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
@@ -2455,10 +2543,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE6assignIPS6_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS6_NS_15iterator_traitsISD_E9referenceEEE5valueEvE4typeESD_SD_"
   },
   {
@@ -2467,11 +2571,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
@@ -2487,6 +2595,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EEPS2_"
   },
   {
@@ -2507,6 +2619,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEEC2Ej"
   },
   {
@@ -2515,6 +2635,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
   },
   {
@@ -2523,6 +2647,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5eraseENS_11__wrap_iterIPKS4_EESB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE6resizeEj"
   },
   {
@@ -2535,10 +2667,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPKhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS8_E9referenceEEE5valueEvE4typeES8_S8_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
   },
   {
@@ -2547,6 +2695,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
@@ -3872,7 +4032,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -3888,11 +4048,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -3901,7 +4061,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4093,7 +4253,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4109,71 +4269,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4493,7 +4653,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4501,7 +4661,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7263,7 +7423,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8245,11 +8405,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8836,11 +8996,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9421,11 +9581,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10737,7 +10897,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10755,7 +10915,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10788,7 +10948,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10803,7 +10963,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10821,7 +10981,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10839,7 +10999,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10866,7 +11026,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10911,7 +11071,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10929,7 +11089,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10950,7 +11110,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10974,7 +11134,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11010,7 +11170,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11049,7 +11209,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11085,7 +11245,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11124,7 +11284,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11157,7 +11317,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11175,7 +11335,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11211,7 +11371,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11232,7 +11392,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14378,6 +14538,19 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/PublicFormat.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::clear",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_5FenceEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::Fence>::~sp",
    "linker_set_key" : "_ZN7android2spINS_5FenceEED2Ev",
    "parameters" :
@@ -14407,6 +14580,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_",
    "parameters" :
@@ -14423,6 +14612,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V4_0::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_",
    "parameters" :
@@ -16105,12 +16310,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
@@ -22028,7 +22227,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22037,7 +22236,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22082,7 +22281,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22118,7 +22317,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22127,7 +22326,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22217,7 +22416,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22226,7 +22425,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22235,7 +22434,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22244,7 +22443,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22253,7 +22452,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22262,7 +22461,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22271,7 +22470,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22289,7 +22488,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22298,7 +22497,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22307,7 +22506,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22316,7 +22515,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22325,7 +22524,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22334,7 +22533,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22343,7 +22542,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22352,7 +22551,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22361,7 +22560,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22370,7 +22569,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22388,7 +22587,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22397,7 +22596,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22424,7 +22623,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22451,7 +22650,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25376,7 +25575,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25507,7 +25706,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25545,7 +25744,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28082,7 +28281,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28138,7 +28337,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28302,7 +28501,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28399,7 +28598,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28558,7 +28757,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28746,7 +28945,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/arm/source-based/libunwindstack.so.lsdump b/34/64/arm/source-based/libunwindstack.so.lsdump
index 913d8c14..976dd972 100644
--- a/34/64/arm/source-based/libunwindstack.so.lsdump
+++ b/34/64/arm/source-based/libunwindstack.so.lsdump
@@ -101,6 +101,24 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextRiscv64.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIA45_j",
+   "name" : "unsigned int[45]",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIA45_j",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA45_y",
+   "name" : "unsigned long long[45]",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIA45_y",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA64_y",
    "name" : "unsigned long long[64]",
@@ -227,379 +245,412 @@
  "elf_functions" :
  [
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
+   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
+   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
+   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_GetGR"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetGR"
   },
   {
-   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetIP"
   },
   {
-   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind17__Unwind_GetIPInfo"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_GetGR"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetGR"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetIP"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind17__Unwind_GetIPInfo"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
+   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
-   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
   },
   {
-   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
+   "name" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips645CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C2Ev"
   },
   {
    "name" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE"
@@ -2490,6 +2541,45 @@
    "name" : "_ZN11unwindstack8MemoryXzD2Ev"
   },
   {
+   "name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips5CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC2Ev"
+  },
+  {
    "name" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy"
   },
   {
@@ -3242,13 +3332,10 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
-  },
-  {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
   },
   {
    "binding" : "weak",
@@ -3317,6 +3404,9 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
+   "name" : "_ZTVN11unwindstack10RegsMips64E"
+  },
+  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3508,6 +3598,9 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
+   "name" : "_ZTVN11unwindstack8RegsMipsE"
+  },
+  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3571,9 +3664,6 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
-  },
-  {
-   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3745,6 +3835,48 @@
    "underlying_type" : "_ZTIy"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS32_EF_R0"
+    },
+    {
+     "enum_field_value" : 40,
+     "name" : "unwindstack::MIPS32_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "name" : "unwindstack::Mips32UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_EF_R0"
+    },
+    {
+     "enum_field_value" : 34,
+     "name" : "unwindstack::MIPS64_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "name" : "unwindstack::Mips64UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4075,6 +4207,163 @@
    "underlying_type" : "_ZTIt"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack7MipsRegE",
+   "name" : "unwindstack::MipsReg",
+   "referenced_type" : "_ZTIN11unwindstack7MipsRegE",
+   "self_type" : "_ZTIN11unwindstack7MipsRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4100,6 +4389,14 @@
     },
     {
      "enum_field_value" : 5,
+     "name" : "unwindstack::ARCH_MIPS"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::ARCH_MIPS64"
+    },
+    {
+     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4367,6 +4664,163 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS64_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS64_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS64_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS64_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS64_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS64_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS64_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS64_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS64_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS64_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS64_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS64_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS64_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS64_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS64_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS64_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS64_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS64_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS64_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS64_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS64_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS64_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS64_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS64_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS64_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS64_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS64_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS64_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS64_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS64_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS64_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack9Mips64RegE",
+   "name" : "unwindstack::Mips64Reg",
+   "referenced_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "self_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "unwindstack::X86_64_REG_RAX"
     },
     {
@@ -4472,6 +4926,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/Maps.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips64::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Arch",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Read",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Clone",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips645CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
    "function_name" : "unwindstack::RegsX86_64::SetFromUcontext",
    "linker_set_key" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE",
    "parameters" :
@@ -7203,6 +7845,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsX86.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Arch",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Read",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Clone",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips5CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "unwindstack::Unwinder::FillInFrame",
    "linker_set_key" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy",
@@ -8135,6 +8965,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64 *",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIPN11unwindstack10RegsMips64E",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64 *",
    "referenced_type" : "_ZTIN11unwindstack10RegsX86_64E",
@@ -8495,6 +9334,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips *",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIPN11unwindstack8RegsMipsE",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack8UnwinderE",
    "name" : "unwindstack::Unwinder *",
    "referenced_type" : "_ZTIN11unwindstack8UnwinderE",
@@ -9011,6 +9859,82 @@
      "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
     }
    ],
+   "linker_set_key" : "_ZTIN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "size" : 40,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack10RegsMips64E"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips644ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplIyE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_pcEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_spEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEty"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips645CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
+    }
+   ],
    "linker_set_key" : "_ZTIN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64",
    "record_kind" : "class",
@@ -9734,6 +10658,32 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/SharedString.h"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_size",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack12mips_stack_tE",
+   "name" : "unwindstack::mips_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "self_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "size" : 12,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
@@ -10080,6 +11030,48 @@
      "referenced_type" : "_ZTIy"
     },
     {
+     "field_name" : "ss_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "name" : "unwindstack::mips64_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "self_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "size" : 24,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_j"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips_user_regsE",
+   "name" : "unwindstack::mips_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "self_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIy"
+    },
+    {
      "field_name" : "ss_flags",
      "field_offset" : 64,
      "referenced_type" : "_ZTIi"
@@ -10473,6 +11465,68 @@
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sc_regmask",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_status",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_regs",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIA32_y"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "name" : "unwindstack::mips_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "size" : 272,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "name" : "unwindstack::mips_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "size" : 296,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -10875,6 +11929,22 @@
    "fields" :
    [
     {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_y"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "name" : "unwindstack::mips64_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "self_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIy"
     }
@@ -11037,6 +12107,103 @@
    "fields" :
    [
     {
+     "field_name" : "sc_regs",
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_fpregs",
+     "field_offset" : 2048,
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_mdhi",
+     "field_offset" : 4096,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi1",
+     "field_offset" : 4160,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi2",
+     "field_offset" : 4224,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi3",
+     "field_offset" : 4288,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_mdlo",
+     "field_offset" : 4352,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo1",
+     "field_offset" : 4416,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo2",
+     "field_offset" : 4480,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo3",
+     "field_offset" : 4544,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 4608,
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "name" : "unwindstack::mips64_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "size" : 584,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "name" : "unwindstack::mips64_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "size" : 624,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "regs",
      "referenced_type" : "_ZTIA32_y"
     }
@@ -12620,6 +13787,82 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplIjEE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "size" : 40,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack8RegsMipsE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips4ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplIjE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_pcEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_spEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEty"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips5CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
diff --git a/34/64/arm/source-based/libutils.so.lsdump b/34/64/arm/source-based/libutils.so.lsdump
index f7476d51..73ceb4e8 100644
--- a/34/64/arm/source-based/libutils.so.lsdump
+++ b/34/64/arm/source-based/libutils.so.lsdump
@@ -493,6 +493,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -504,6 +508,10 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
+  },
+  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -738,6 +746,9 @@
    "name" : "_ZN7android7String813appendFormatVEPKcSt9__va_list"
   },
   {
+   "name" : "_ZN7android7String816convertToResPathEv"
+  },
+  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1216,6 +1227,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1240,6 +1255,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueIyEEjRKT_"
   },
   {
@@ -1252,6 +1271,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE4findIyEENS_15__hash_iteratorIPNS_11__hash_nodeIS5_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS5_PvEEEE"
   },
   {
@@ -5741,6 +5764,19 @@
    "source_file" : "system/core/libutils/include/utils/misc.h"
   },
   {
+   "function_name" : "android::sp<android::LooperCallback>::clear",
+   "linker_set_key" : "_ZN7android2spINS_14LooperCallbackEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14LooperCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::SimpleLooperCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_",
    "parameters" :
@@ -5786,6 +5822,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::Thread>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6ThreadEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6ThreadEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6ThreadEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6ThreadEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::LightRefBase_reportIncStrongRequireStrongFailed",
    "linker_set_key" : "_ZN7android47LightRefBase_reportIncStrongRequireStrongFailedEPKv",
    "parameters" :
@@ -7016,6 +7068,19 @@
    "source_file" : "system/core/libutils/include/utils/String8.h"
   },
   {
+   "function_name" : "android::String8::convertToResPath",
+   "linker_set_key" : "_ZN7android7String816convertToResPathEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android7String8E"
+    }
+   ],
+   "return_type" : "_ZTIRN7android7String8E",
+   "source_file" : "system/core/libutils/include/utils/String8.h"
+  },
+  {
    "function_name" : "android::String8::clear",
    "linker_set_key" : "_ZN7android7String85clearEv",
    "parameters" :
diff --git a/34/64/arm/source-based/libxml2.so.lsdump b/34/64/arm/source-based/libxml2.so.lsdump
index e54cd233..95087cac 100644
--- a/34/64/arm/source-based/libxml2.so.lsdump
+++ b/34/64/arm/source-based/libxml2.so.lsdump
@@ -719,9 +719,6 @@
    "name" : "xmlCtxtResetPush"
   },
   {
-   "name" : "xmlCtxtSetMaxAmplification"
-  },
-  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1406,9 +1403,6 @@
    "name" : "xmlMemShow"
   },
   {
-   "name" : "xmlMemSize"
-  },
-  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1922,9 +1916,6 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
-   "name" : "xmlParserInputBufferCreateString"
-  },
-  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3011,9 +3002,6 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
-   "name" : "xmlTextReaderSetMaxAmplification"
-  },
-  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5402,43 +5390,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "XML_ENC_ERR_SUCCESS"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "XML_ENC_ERR_SPACE"
-    },
-    {
-     "enum_field_value" : -2,
-     "name" : "XML_ENC_ERR_INPUT"
-    },
-    {
-     "enum_field_value" : -3,
-     "name" : "XML_ENC_ERR_PARTIAL"
-    },
-    {
-     "enum_field_value" : -4,
-     "name" : "XML_ENC_ERR_INTERNAL"
-    },
-    {
-     "enum_field_value" : -5,
-     "name" : "XML_ENC_ERR_MEMORY"
-    }
-   ],
-   "linker_set_key" : "_ZTI15xmlCharEncError",
-   "name" : "xmlCharEncError",
-   "referenced_type" : "_ZTI15xmlCharEncError",
-   "self_type" : "_ZTI15xmlCharEncError",
-   "size" : 4,
-   "source_file" : "external/libxml2/include/libxml/encoding.h",
-   "underlying_type" : "_ZTIi"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : -1,
      "name" : "XML_CHAR_ENCODING_ERROR"
     },
@@ -6021,10 +5972,6 @@
      "name" : "XML_ERR_COMMENT_ABRUPTLY_ENDED"
     },
     {
-     "enum_field_value" : 113,
-     "name" : "XML_WAR_ENCODING_MISMATCH"
-    },
-    {
      "enum_field_value" : 200,
      "name" : "XML_NS_ERR_XML_NAMESPACE"
     },
@@ -9544,10 +9491,6 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -14028,21 +13971,6 @@
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
-   "function_name" : "xmlCtxtSetMaxAmplification",
-   "linker_set_key" : "xmlCtxtSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlParserCtxt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/parser.h"
-  },
-  {
    "function_name" : "xmlCtxtUseOptions",
    "linker_set_key" : "xmlCtxtUseOptions",
    "parameters" :
@@ -17292,18 +17220,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
   },
   {
-   "function_name" : "xmlMemSize",
-   "linker_set_key" : "xmlMemSize",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
-  },
-  {
    "function_name" : "xmlMemStrdupLoc",
    "linker_set_key" : "xmlMemStrdupLoc",
    "parameters" :
@@ -19827,18 +19743,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlIO.h"
   },
   {
-   "function_name" : "xmlParserInputBufferCreateString",
-   "linker_set_key" : "xmlParserInputBufferCreateString",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    }
-   ],
-   "return_type" : "_ZTIP21_xmlParserInputBuffer",
-   "source_file" : "external/libxml2/include/private/io.h"
-  },
-  {
    "function_name" : "xmlParserInputBufferGrow",
    "linker_set_key" : "xmlParserInputBufferGrow",
    "parameters" :
@@ -22715,7 +22619,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25503,21 +25407,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlreader.h"
   },
   {
-   "function_name" : "xmlTextReaderSetMaxAmplification",
-   "linker_set_key" : "xmlTextReaderSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlTextReader"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/xmlreader.h"
-  },
-  {
    "function_name" : "xmlTextReaderSetParserProp",
    "linker_set_key" : "xmlTextReaderSetParserProp",
    "parameters" :
@@ -35401,18 +35290,13 @@
      "field_name" : "nbWarnings",
      "field_offset" : 3824,
      "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "maxAmpl",
-     "field_offset" : 3840,
-     "referenced_type" : "_ZTIj"
     }
    ],
    "linker_set_key" : "_ZTI14_xmlParserCtxt",
    "name" : "_xmlParserCtxt",
    "referenced_type" : "_ZTI14_xmlParserCtxt",
    "self_type" : "_ZTI14_xmlParserCtxt",
-   "size" : 484,
+   "size" : 480,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -36096,7 +35980,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "flags",
+     "field_name" : "standalone",
      "field_offset" : 416,
      "referenced_type" : "_ZTIi"
     },
diff --git a/34/64/arm/source-based/libyuv.so.lsdump b/34/64/arm/source-based/libyuv.so.lsdump
index 95b97f04..ae873e6c 100644
--- a/34/64/arm/source-based/libyuv.so.lsdump
+++ b/34/64/arm/source-based/libyuv.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -131,30 +131,12 @@
    "name" : "ABGRToI420"
   },
   {
-   "name" : "ABGRToJ400"
-  },
-  {
-   "name" : "ABGRToJ420"
-  },
-  {
-   "name" : "ABGRToJ422"
-  },
-  {
    "name" : "ABGRToNV12"
   },
   {
    "name" : "ABGRToNV21"
   },
   {
-   "name" : "ABGRToUVJRow_Any_NEON"
-  },
-  {
-   "name" : "ABGRToUVJRow_C"
-  },
-  {
-   "name" : "ABGRToUVJRow_NEON"
-  },
-  {
    "name" : "ABGRToUVRow_Any_NEON"
   },
   {
@@ -164,15 +146,6 @@
    "name" : "ABGRToUVRow_NEON"
   },
   {
-   "name" : "ABGRToYJRow_Any_NEON"
-  },
-  {
-   "name" : "ABGRToYJRow_C"
-  },
-  {
-   "name" : "ABGRToYJRow_NEON"
-  },
-  {
    "name" : "ABGRToYRow_Any_NEON"
   },
   {
@@ -572,9 +545,6 @@
    "name" : "ARGBToI420"
   },
   {
-   "name" : "ARGBToI420Alpha"
-  },
-  {
    "name" : "ARGBToI422"
   },
   {
@@ -881,18 +851,6 @@
    "name" : "DetilePlane"
   },
   {
-   "name" : "DetilePlane_16"
-  },
-  {
-   "name" : "DetileRow_16_Any_NEON"
-  },
-  {
-   "name" : "DetileRow_16_C"
-  },
-  {
-   "name" : "DetileRow_16_NEON"
-  },
-  {
    "name" : "DetileRow_Any_NEON"
   },
   {
@@ -914,18 +872,6 @@
    "name" : "DetileSplitUVRow_NEON"
   },
   {
-   "name" : "DetileToYUY2"
-  },
-  {
-   "name" : "DetileToYUY2_Any_NEON"
-  },
-  {
-   "name" : "DetileToYUY2_C"
-  },
-  {
-   "name" : "DetileToYUY2_NEON"
-  },
-  {
    "name" : "DivideRow_16_Any_NEON"
   },
   {
@@ -1070,9 +1016,6 @@
    "name" : "I010Copy"
   },
   {
-   "name" : "I010Rotate"
-  },
-  {
    "name" : "I010ToAB30"
   },
   {
@@ -1130,9 +1073,6 @@
    "name" : "I210Copy"
   },
   {
-   "name" : "I210Rotate"
-  },
-  {
    "name" : "I210ToAB30"
   },
   {
@@ -1184,9 +1124,6 @@
    "name" : "I212ToARGBRow_C"
   },
   {
-   "name" : "I212ToI420"
-  },
-  {
    "name" : "I212ToI422"
   },
   {
@@ -1229,12 +1166,6 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
-   "name" : "I410Copy"
-  },
-  {
-   "name" : "I410Rotate"
-  },
-  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1250,15 +1181,9 @@
    "name" : "I410ToI010"
   },
   {
-   "name" : "I410ToI420"
-  },
-  {
    "name" : "I410ToI444"
   },
   {
-   "name" : "I412ToI420"
-  },
-  {
    "name" : "I412ToI444"
   },
   {
@@ -1367,9 +1292,6 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
-   "name" : "I420ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1484,18 +1406,6 @@
    "name" : "I422ToNV21"
   },
   {
-   "name" : "I422ToRAW"
-  },
-  {
-   "name" : "I422ToRGB24"
-  },
-  {
-   "name" : "I422ToRGB24Matrix"
-  },
-  {
-   "name" : "I422ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I422ToRGB24Row_Any_NEON"
   },
   {
@@ -1508,9 +1418,6 @@
    "name" : "I422ToRGB565"
   },
   {
-   "name" : "I422ToRGB565Matrix"
-  },
-  {
    "name" : "I422ToRGB565Row_Any_NEON"
   },
   {
@@ -1619,24 +1526,6 @@
    "name" : "I444ToNV21"
   },
   {
-   "name" : "I444ToRAW"
-  },
-  {
-   "name" : "I444ToRGB24"
-  },
-  {
-   "name" : "I444ToRGB24Matrix"
-  },
-  {
-   "name" : "I444ToRGB24Row_Any_NEON"
-  },
-  {
-   "name" : "I444ToRGB24Row_C"
-  },
-  {
-   "name" : "I444ToRGB24Row_NEON"
-  },
-  {
    "name" : "InitCpuFlags"
   },
   {
@@ -1727,12 +1616,6 @@
    "name" : "MM21ToNV12"
   },
   {
-   "name" : "MM21ToYUY2"
-  },
-  {
-   "name" : "MT2TToP010"
-  },
-  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -1763,6 +1646,12 @@
    "name" : "MergeARGBPlane"
   },
   {
+   "name" : "MergeARGBPlaneAlpha"
+  },
+  {
+   "name" : "MergeARGBPlaneOpaque"
+  },
+  {
    "name" : "MergeARGBRow_Any_NEON"
   },
   {
@@ -1856,9 +1745,6 @@
    "name" : "MirrorPlane"
   },
   {
-   "name" : "MirrorRow_16_C"
-  },
-  {
    "name" : "MirrorRow_Any_NEON"
   },
   {
@@ -2036,15 +1922,9 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
-   "name" : "P010ToI010"
-  },
-  {
    "name" : "P010ToP410"
   },
   {
-   "name" : "P012ToI012"
-  },
-  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2315,9 +2195,6 @@
    "name" : "RGBToYMatrixRow_NEON"
   },
   {
-   "name" : "RiscvCpuCaps"
-  },
-  {
    "name" : "RotatePlane"
   },
   {
@@ -2330,9 +2207,6 @@
    "name" : "RotatePlane90"
   },
   {
-   "name" : "RotatePlane_16"
-  },
-  {
    "name" : "Scale"
   },
   {
@@ -2474,9 +2348,6 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
-   "name" : "ScalePlaneDown2_16To8"
-  },
-  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2510,12 +2381,6 @@
    "name" : "ScalePlane_16"
   },
   {
-   "name" : "ScaleRowDown2Box_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Box_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2534,12 +2399,6 @@
    "name" : "ScaleRowDown2Box_Odd_NEON"
   },
   {
-   "name" : "ScaleRowDown2Linear_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2552,12 +2411,6 @@
    "name" : "ScaleRowDown2Linear_NEON"
   },
   {
-   "name" : "ScaleRowDown2_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -2774,24 +2627,12 @@
    "name" : "ScaleUVRowDown2Box_NEON"
   },
   {
-   "name" : "ScaleUVRowDown2Linear_Any_NEON"
-  },
-  {
    "name" : "ScaleUVRowDown2Linear_C"
   },
   {
-   "name" : "ScaleUVRowDown2Linear_NEON"
-  },
-  {
-   "name" : "ScaleUVRowDown2_Any_NEON"
-  },
-  {
    "name" : "ScaleUVRowDown2_C"
   },
   {
-   "name" : "ScaleUVRowDown2_NEON"
-  },
-  {
    "name" : "ScaleUVRowDownEvenBox_C"
   },
   {
@@ -2906,6 +2747,12 @@
    "name" : "SplitARGBPlane"
   },
   {
+   "name" : "SplitARGBPlaneAlpha"
+  },
+  {
+   "name" : "SplitARGBPlaneOpaque"
+  },
+  {
    "name" : "SplitARGBRow_Any_NEON"
   },
   {
@@ -2996,21 +2843,9 @@
    "name" : "SwapUVRow_NEON"
   },
   {
-   "name" : "Transpose4x4_32_C"
-  },
-  {
-   "name" : "Transpose4x4_32_NEON"
-  },
-  {
    "name" : "TransposePlane"
   },
   {
-   "name" : "TransposePlane_16"
-  },
-  {
-   "name" : "TransposeUVWx8_16_C"
-  },
-  {
    "name" : "TransposeUVWx8_Any_NEON"
   },
   {
@@ -3023,9 +2858,6 @@
    "name" : "TransposeUVWxH_C"
   },
   {
-   "name" : "TransposeWx8_16_C"
-  },
-  {
    "name" : "TransposeWx8_Any_NEON"
   },
   {
@@ -3035,9 +2867,6 @@
    "name" : "TransposeWx8_NEON"
   },
   {
-   "name" : "TransposeWxH_16_C"
-  },
-  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3140,12 +2969,6 @@
    "name" : "UYVYToYRow_NEON"
   },
   {
-   "name" : "UnpackMT2T_C"
-  },
-  {
-   "name" : "UnpackMT2T_NEON"
-  },
-  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3173,15 +2996,6 @@
    "name" : "YUY2ToNV12"
   },
   {
-   "name" : "YUY2ToNVUVRow_Any_NEON"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_C"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_NEON"
-  },
-  {
    "name" : "YUY2ToUV422Row_Any_NEON"
   },
   {
@@ -3405,7 +3219,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3446,7 +3260,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3479,7 +3293,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3792,7 +3606,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4041,7 +3855,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4069,7 +3883,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4093,7 +3907,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4123,7 +3937,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_NEON",
@@ -4141,7 +3955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4159,7 +3973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_NEON",
@@ -4177,7 +3991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4204,7 +4018,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4222,7 +4036,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4249,7 +4063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4288,112 +4102,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ400",
-   "linker_set_key" : "ABGRToJ400",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ420",
-   "linker_set_key" : "ABGRToJ420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ422",
-   "linker_set_key" : "ABGRToJ422",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4426,7 +4135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4459,79 +4168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_Any_NEON",
-   "linker_set_key" : "ABGRToUVJRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_C",
-   "linker_set_key" : "ABGRToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_NEON",
-   "linker_set_key" : "ABGRToUVJRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_NEON",
@@ -4555,7 +4192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -4579,7 +4216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_NEON",
@@ -4603,61 +4240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_Any_NEON",
-   "linker_set_key" : "ABGRToYJRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_C",
-   "linker_set_key" : "ABGRToYJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_NEON",
-   "linker_set_key" : "ABGRToYJRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_NEON",
@@ -4675,7 +4258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -4693,7 +4276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_NEON",
@@ -4711,7 +4294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -4738,7 +4321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -4756,7 +4339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -4783,7 +4366,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -4801,7 +4384,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -4828,7 +4411,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -4846,7 +4429,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -4876,7 +4459,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -4897,7 +4480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -4924,7 +4507,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -4951,7 +4534,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_NEON",
@@ -4969,7 +4552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -4987,7 +4570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_NEON",
@@ -5005,7 +4588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -5032,7 +4615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_NEON",
@@ -5050,7 +4633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -5068,7 +4651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_NEON",
@@ -5086,7 +4669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -5125,7 +4708,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_Any_NEON",
@@ -5149,7 +4732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -5173,7 +4756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_NEON",
@@ -5197,7 +4780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_Any_NEON",
@@ -5215,7 +4798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -5233,7 +4816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_NEON",
@@ -5251,7 +4834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -5278,7 +4861,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_NEON",
@@ -5296,7 +4879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -5314,7 +4897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_NEON",
@@ -5332,7 +4915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -5371,7 +4954,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_Any_NEON",
@@ -5395,7 +4978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5419,7 +5002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_NEON",
@@ -5443,7 +5026,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_Any_NEON",
@@ -5461,7 +5044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5479,7 +5062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_NEON",
@@ -5497,7 +5080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5530,7 +5113,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_NEON",
@@ -5551,7 +5134,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5572,7 +5155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_NEON",
@@ -5593,7 +5176,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5617,7 +5200,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -5644,7 +5227,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_NEON",
@@ -5662,7 +5245,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -5680,7 +5263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_NEON",
@@ -5698,7 +5281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -5731,7 +5314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -5752,7 +5335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_NEON",
@@ -5773,7 +5356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -5809,7 +5392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -5839,7 +5422,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -5860,7 +5443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_NEON",
@@ -5881,7 +5464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -5911,7 +5494,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -5929,7 +5512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -5956,7 +5539,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -5983,7 +5566,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6010,7 +5593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -6028,7 +5611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -6055,7 +5638,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -6073,7 +5656,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -6094,7 +5677,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -6121,7 +5704,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_NEON",
@@ -6139,7 +5722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -6157,7 +5740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_NEON",
@@ -6175,7 +5758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -6202,7 +5785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -6220,7 +5803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_NEON",
@@ -6238,7 +5821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -6265,7 +5848,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -6301,7 +5884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -6331,7 +5914,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -6355,7 +5938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -6382,7 +5965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_NEON",
@@ -6400,7 +5983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -6418,7 +6001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_NEON",
@@ -6436,7 +6019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -6469,7 +6052,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_NEON",
@@ -6490,7 +6073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -6511,7 +6094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_NEON",
@@ -6532,7 +6115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -6562,7 +6145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -6583,7 +6166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -6619,7 +6202,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -6643,7 +6226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_NEON",
@@ -6667,7 +6250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -6697,37 +6280,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBRotate",
-   "linker_set_key" : "ARGBRotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -6754,7 +6307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -6769,7 +6322,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_NEON",
@@ -6784,7 +6337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_Any_NEON",
@@ -6802,7 +6355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -6820,7 +6373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_NEON",
@@ -6838,7 +6391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -6868,7 +6421,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -6889,7 +6442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_NEON",
@@ -6910,7 +6463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -6940,7 +6493,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_NEON",
@@ -6961,7 +6514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -6982,7 +6535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_NEON",
@@ -7003,7 +6556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -7030,7 +6583,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -7057,7 +6610,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -7084,7 +6637,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -7117,7 +6670,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_NEON",
@@ -7138,7 +6691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -7159,7 +6712,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_NEON",
@@ -7180,7 +6733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -7207,7 +6760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_NEON",
@@ -7225,7 +6778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -7243,7 +6796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_NEON",
@@ -7261,34 +6814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToABGR",
-   "linker_set_key" : "ARGBToABGR",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -7315,7 +6841,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -7333,7 +6859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -7360,7 +6886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_NEON",
@@ -7378,7 +6904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -7396,7 +6922,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_NEON",
@@ -7414,7 +6940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -7441,7 +6967,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_NEON",
@@ -7459,7 +6985,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -7477,7 +7003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_NEON",
@@ -7495,7 +7021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -7522,7 +7048,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_NEON",
@@ -7540,7 +7066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -7558,7 +7084,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_NEON",
@@ -7576,34 +7102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToBGRA",
-   "linker_set_key" : "ARGBToBGRA",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -7630,7 +7129,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -7669,52 +7168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToI420Alpha",
-   "linker_set_key" : "ARGBToI420Alpha",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -7753,7 +7207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -7792,7 +7246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -7819,7 +7273,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -7858,7 +7312,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -7897,7 +7351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -7930,7 +7384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -7963,7 +7417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -7990,7 +7444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_NEON",
@@ -8008,7 +7462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -8026,7 +7480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_NEON",
@@ -8044,7 +7498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -8071,7 +7525,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_NEON",
@@ -8089,7 +7543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -8107,7 +7561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_NEON",
@@ -8125,7 +7579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -8152,7 +7606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -8182,7 +7636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_NEON",
@@ -8203,7 +7657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -8217,14 +7671,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_NEON",
@@ -8238,14 +7692,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_NEON",
@@ -8263,7 +7717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -8281,7 +7735,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_NEON",
@@ -8299,7 +7753,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -8326,7 +7780,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_NEON",
@@ -8347,7 +7801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -8368,7 +7822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_NEON",
@@ -8389,7 +7843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_NEON",
@@ -8413,7 +7867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -8437,7 +7891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_NEON",
@@ -8461,7 +7915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_NEON",
@@ -8485,7 +7939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -8509,7 +7963,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_NEON",
@@ -8533,7 +7987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -8560,7 +8014,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_NEON",
@@ -8578,7 +8032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -8596,7 +8050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_NEON",
@@ -8614,7 +8068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_NEON",
@@ -8632,7 +8086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -8650,7 +8104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_NEON",
@@ -8668,7 +8122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -8695,7 +8149,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -8722,7 +8176,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -8740,7 +8194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -8773,7 +8227,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -8806,7 +8260,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_Any_NEON",
@@ -8827,7 +8281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -8848,7 +8302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_NEON",
@@ -8869,7 +8323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_Any_NEON",
@@ -8890,7 +8344,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -8911,7 +8365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_NEON",
@@ -8932,7 +8386,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_Any_NEON",
@@ -8950,7 +8404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -8968,7 +8422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_NEON",
@@ -8986,7 +8440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -9028,7 +8482,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -9070,7 +8524,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -9115,7 +8569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -9169,7 +8623,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -9226,7 +8680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -9238,7 +8692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -9265,7 +8719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -9304,7 +8758,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_NEON",
@@ -9328,7 +8782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -9352,7 +8806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_NEON",
@@ -9376,7 +8830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_NEON",
@@ -9394,7 +8848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -9412,7 +8866,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_NEON",
@@ -9430,7 +8884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -9469,7 +8923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -9493,7 +8947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -9514,7 +8968,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_Any_NEON",
@@ -9535,7 +8989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -9556,7 +9010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_NEON",
@@ -9577,7 +9031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -9604,7 +9058,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -9631,7 +9085,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -9643,7 +9097,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -9664,7 +9118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -9682,7 +9136,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -9700,7 +9154,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -9727,7 +9181,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -9757,7 +9211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_NEON",
@@ -9778,7 +9232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -9799,7 +9253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_NEON",
@@ -9820,7 +9274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -9850,7 +9304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -9871,7 +9325,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -9913,7 +9367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -9958,7 +9412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -10015,7 +9469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -10045,7 +9499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -10075,7 +9529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -10102,7 +9556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -10129,7 +9583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -10147,7 +9601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_NEON",
@@ -10165,7 +9619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -10183,7 +9637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_NEON",
@@ -10201,7 +9655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -10219,7 +9673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -10246,7 +9700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -10275,101 +9729,8 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetilePlane_16",
-   "linker_set_key" : "DetilePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_Any_NEON",
-   "linker_set_key" : "DetileRow_16_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_C",
-   "linker_set_key" : "DetileRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_NEON",
-   "linker_set_key" : "DetileRow_16_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_NEON",
@@ -10390,7 +9751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -10411,7 +9772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_NEON",
@@ -10432,7 +9793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -10468,7 +9829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_NEON",
@@ -10492,7 +9853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -10516,7 +9877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_NEON",
@@ -10540,124 +9901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2",
-   "linker_set_key" : "DetileToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_Any_NEON",
-   "linker_set_key" : "DetileToYUY2_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_C",
-   "linker_set_key" : "DetileToYUY2_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_NEON",
-   "linker_set_key" : "DetileToYUY2_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_NEON",
@@ -10678,7 +9922,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -10699,7 +9943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_NEON",
@@ -10720,7 +9964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -10735,7 +9979,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -10750,37 +9994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::GaussCol_C",
-   "linker_set_key" : "GaussCol_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -10810,7 +10024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -10837,25 +10051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::GaussRow_C",
-   "linker_set_key" : "GaussRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKj"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -10873,13 +10069,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -10918,7 +10114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -10957,7 +10153,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -10996,7 +10192,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -11035,7 +10231,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -11074,7 +10270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -11113,7 +10309,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -11152,7 +10348,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -11191,7 +10387,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -11230,7 +10426,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -11269,7 +10465,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -11308,7 +10504,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -11347,7 +10543,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -11386,7 +10582,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -11425,7 +10621,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -11464,7 +10660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -11503,7 +10699,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -11542,7 +10738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -11581,7 +10777,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -11620,7 +10816,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_Any_NEON",
@@ -11641,7 +10837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_NEON",
@@ -11662,7 +10858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -11692,7 +10888,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_NEON",
@@ -11713,7 +10909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -11734,7 +10930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_NEON",
@@ -11755,7 +10951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -11788,7 +10984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -11815,7 +11011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_NEON",
@@ -11842,7 +11038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -11860,7 +11056,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_NEON",
@@ -11878,7 +11074,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -11896,7 +11092,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -11914,7 +11110,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -11965,7 +11161,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -12019,7 +11215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -12070,61 +11266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I010Rotate",
-   "linker_set_key" : "I010Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -12163,7 +11305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -12202,7 +11344,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -12241,7 +11383,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -12283,7 +11425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -12328,7 +11470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -12367,7 +11509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -12409,7 +11551,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -12454,7 +11596,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -12505,7 +11647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -12556,7 +11698,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -12601,7 +11743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -12643,7 +11785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -12685,7 +11827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -12736,7 +11878,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -12781,7 +11923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -12832,7 +11974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -12886,7 +12028,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -12916,7 +12058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -12967,61 +12109,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I210Rotate",
-   "linker_set_key" : "I210Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -13060,7 +12148,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -13099,7 +12187,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -13138,7 +12226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -13180,7 +12268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -13225,7 +12313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -13252,7 +12340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -13291,7 +12379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -13333,7 +12421,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -13378,7 +12466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -13405,7 +12493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -13456,7 +12544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -13507,7 +12595,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -13558,7 +12646,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -13609,7 +12697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -13654,7 +12742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -13681,7 +12769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -13708,58 +12796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I212ToI420",
-   "linker_set_key" : "I212ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -13810,7 +12847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -13855,7 +12892,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -13882,7 +12919,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -13909,7 +12946,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -13936,7 +12973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -13966,7 +13003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_NEON",
@@ -13987,7 +13024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -14008,7 +13045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_NEON",
@@ -14029,7 +13066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -14056,7 +13093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -14095,7 +13132,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -14128,7 +13165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -14179,7 +13216,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -14209,112 +13246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I410Copy",
-   "linker_set_key" : "I410Copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I410Rotate",
-   "linker_set_key" : "I410Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -14356,7 +13288,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -14383,7 +13315,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -14425,7 +13357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -14452,7 +13384,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -14503,58 +13435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I410ToI420",
-   "linker_set_key" : "I410ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -14605,58 +13486,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I412ToI420",
-   "linker_set_key" : "I412ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -14707,7 +13537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -14755,7 +13585,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -14803,7 +13633,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -14854,7 +13684,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -14908,7 +13738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -14983,7 +13813,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -15034,7 +13864,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -15106,7 +13936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -15157,7 +13987,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -15208,7 +14038,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -15256,7 +14086,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -15310,7 +14140,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -15370,7 +14200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -15430,7 +14260,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -15490,7 +14320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -15541,7 +14371,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -15580,7 +14410,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -15619,7 +14449,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -15658,7 +14488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -15700,7 +14530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -15739,7 +14569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -15778,7 +14608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -15817,7 +14647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -15859,7 +14689,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -15904,7 +14734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -15943,7 +14773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -15994,7 +14824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -16045,7 +14875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -16084,7 +14914,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -16135,7 +14965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -16186,7 +15016,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -16231,7 +15061,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -16276,7 +15106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -16315,7 +15145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -16354,7 +15184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -16396,52 +15226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I420ToRGB24MatrixFilter",
-   "linker_set_key" : "I420ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -16480,7 +15265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -16522,7 +15307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -16564,7 +15349,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -16603,7 +15388,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -16645,7 +15430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -16684,7 +15469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -16723,7 +15508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -16771,7 +15556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -16819,7 +15604,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -16870,7 +15655,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -16924,7 +15709,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_NEON",
@@ -16954,7 +15739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -16984,7 +15769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_NEON",
@@ -17014,7 +15799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -17065,7 +15850,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -17119,7 +15904,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -17179,7 +15964,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -17239,7 +16024,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -17299,7 +16084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -17338,7 +16123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -17365,7 +16150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -17404,7 +16189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_NEON",
@@ -17431,7 +16216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -17458,7 +16243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_NEON",
@@ -17485,7 +16270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_NEON",
@@ -17512,7 +16297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -17539,7 +16324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_NEON",
@@ -17566,7 +16351,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -17608,7 +16393,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -17653,7 +16438,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_NEON",
@@ -17680,7 +16465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -17707,7 +16492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_NEON",
@@ -17734,7 +16519,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -17773,7 +16558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -17824,7 +16609,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -17875,7 +16660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -17926,7 +16711,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -17971,172 +16756,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRAW",
-   "linker_set_key" : "I422ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24",
-   "linker_set_key" : "I422ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24Matrix",
-   "linker_set_key" : "I422ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24MatrixFilter",
-   "linker_set_key" : "I422ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_NEON",
@@ -18163,7 +16783,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -18190,7 +16810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_NEON",
@@ -18217,7 +16837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -18256,49 +16876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB565Matrix",
-   "linker_set_key" : "I422ToRGB565Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_NEON",
@@ -18325,7 +16903,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -18352,7 +16930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_NEON",
@@ -18379,7 +16957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -18418,7 +16996,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -18460,7 +17038,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_NEON",
@@ -18487,7 +17065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -18514,7 +17092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_NEON",
@@ -18541,7 +17119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -18580,7 +17158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_NEON",
@@ -18604,7 +17182,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -18628,7 +17206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_NEON",
@@ -18652,7 +17230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -18691,7 +17269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_NEON",
@@ -18715,7 +17293,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -18739,7 +17317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_NEON",
@@ -18763,7 +17341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -18811,7 +17389,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -18859,7 +17437,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -18910,7 +17488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_NEON",
@@ -18940,7 +17518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -18970,7 +17548,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_NEON",
@@ -19000,7 +17578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -19051,7 +17629,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -19105,7 +17683,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -19165,7 +17743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -19225,7 +17803,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -19285,7 +17863,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -19324,7 +17902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -19363,7 +17941,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -19405,7 +17983,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_NEON",
@@ -19432,7 +18010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -19459,7 +18037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_NEON",
@@ -19486,7 +18064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -19537,7 +18115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -19582,7 +18160,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -19627,214 +18205,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRAW",
-   "linker_set_key" : "I444ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24",
-   "linker_set_key" : "I444ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Matrix",
-   "linker_set_key" : "I444ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_Any_NEON",
-   "linker_set_key" : "I444ToRGB24Row_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_C",
-   "linker_set_key" : "I444ToRGB24Row_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_NEON",
-   "linker_set_key" : "I444ToRGB24Row_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -19870,7 +18247,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -19906,7 +18283,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -19933,7 +18310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_Any_NEON",
@@ -19957,7 +18334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -19981,7 +18358,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_NEON",
@@ -20005,7 +18382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_NEON",
@@ -20029,7 +18406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -20053,7 +18430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_NEON",
@@ -20077,7 +18454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -20104,7 +18481,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_NEON",
@@ -20122,7 +18499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -20140,7 +18517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_NEON",
@@ -20158,7 +18535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -20197,7 +18574,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -20236,7 +18613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -20275,7 +18652,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -20314,7 +18691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -20353,7 +18730,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -20392,7 +18769,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -20431,7 +18808,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -20470,7 +18847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -20509,7 +18886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -20530,7 +18907,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -20563,7 +18940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -20608,7 +18985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -20647,7 +19024,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -20686,7 +19063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -20731,7 +19108,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -20770,79 +19147,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MM21ToYUY2",
-   "linker_set_key" : "MM21ToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MT2TToP010",
-   "linker_set_key" : "MT2TToP010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -20854,7 +19159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -20902,7 +19207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_NEON",
@@ -20932,7 +19237,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -20962,7 +19267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_NEON",
@@ -20992,7 +19297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -21040,7 +19345,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_NEON",
@@ -21070,7 +19375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -21100,7 +19405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_NEON",
@@ -21130,7 +19435,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -21175,7 +19480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_NEON",
@@ -21202,7 +19507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -21229,7 +19534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_NEON",
@@ -21256,7 +19561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -21295,7 +19600,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -21319,7 +19624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_NEON",
@@ -21343,7 +19648,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -21376,7 +19681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -21412,7 +19717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_NEON",
@@ -21436,7 +19741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -21460,7 +19765,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_NEON",
@@ -21484,7 +19789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_NEON",
@@ -21505,7 +19810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -21526,7 +19831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_NEON",
@@ -21547,7 +19852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -21589,7 +19894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_Any_NEON",
@@ -21616,7 +19921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_NEON",
@@ -21643,7 +19948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_NEON",
@@ -21670,7 +19975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -21697,7 +20002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_NEON",
@@ -21724,7 +20029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_NEON",
@@ -21751,7 +20056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -21778,7 +20083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_NEON",
@@ -21805,7 +20110,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_NEON",
@@ -21832,7 +20137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -21859,7 +20164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_NEON",
@@ -21886,7 +20191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_NEON",
@@ -21910,7 +20215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -21934,7 +20239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_NEON",
@@ -21958,7 +20263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -21970,7 +20275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -21997,25 +20302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::MirrorRow_16_C",
-   "linker_set_key" : "MirrorRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_NEON",
@@ -22033,7 +20320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -22051,7 +20338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_NEON",
@@ -22069,7 +20356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -22090,7 +20377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_NEON",
@@ -22111,7 +20398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -22138,7 +20425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_NEON",
@@ -22156,7 +20443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -22174,7 +20461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_NEON",
@@ -22192,7 +20479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_NEON",
@@ -22213,7 +20500,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -22234,7 +20521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_NEON",
@@ -22255,7 +20542,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -22294,7 +20581,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -22333,7 +20620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -22381,7 +20668,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -22414,7 +20701,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -22447,7 +20734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -22483,7 +20770,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_NEON",
@@ -22507,7 +20794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -22531,7 +20818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_NEON",
@@ -22555,7 +20842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -22600,7 +20887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -22648,7 +20935,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -22687,7 +20974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -22720,7 +21007,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -22753,7 +21040,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -22789,7 +21076,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_NEON",
@@ -22813,7 +21100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -22837,7 +21124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_NEON",
@@ -22861,7 +21148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -22894,7 +21181,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -22930,7 +21217,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_NEON",
@@ -22954,7 +21241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -22978,7 +21265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_NEON",
@@ -23002,7 +21289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -23041,7 +21328,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -23080,7 +21367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -23113,7 +21400,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -23146,7 +21433,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -23182,7 +21469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_NEON",
@@ -23206,7 +21493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -23230,7 +21517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_NEON",
@@ -23254,7 +21541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -23299,7 +21586,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -23338,7 +21625,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -23371,7 +21658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -23404,7 +21691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -23440,7 +21727,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_NEON",
@@ -23464,7 +21751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -23488,7 +21775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_NEON",
@@ -23512,7 +21799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -23545,7 +21832,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_NEON",
@@ -23566,7 +21853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -23587,7 +21874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_NEON",
@@ -23608,7 +21895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -23644,7 +21931,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -23683,7 +21970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -23719,7 +22006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -23758,52 +22045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::P010ToI010",
-   "linker_set_key" : "P010ToI010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -23842,52 +22084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::P012ToI012",
-   "linker_set_key" : "P012ToI012",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -23923,7 +22120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -23962,7 +22159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -23986,7 +22183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -24022,7 +22219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -24061,7 +22258,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -24085,7 +22282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -24124,7 +22321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -24148,7 +22345,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -24172,7 +22369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -24199,7 +22396,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_NEON",
@@ -24217,7 +22414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -24235,7 +22432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_NEON",
@@ -24253,7 +22450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -24292,7 +22489,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -24319,7 +22516,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -24358,7 +22555,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -24391,7 +22588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -24418,7 +22615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_NEON",
@@ -24436,7 +22633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -24454,7 +22651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_NEON",
@@ -24472,7 +22669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -24499,7 +22696,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_NEON",
@@ -24517,7 +22714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -24535,7 +22732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_NEON",
@@ -24553,7 +22750,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_Any_NEON",
@@ -24577,7 +22774,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -24601,7 +22798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_NEON",
@@ -24625,7 +22822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_Any_NEON",
@@ -24649,7 +22846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -24673,7 +22870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_NEON",
@@ -24697,7 +22894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_NEON",
@@ -24715,7 +22912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -24733,7 +22930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_NEON",
@@ -24751,7 +22948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_Any_NEON",
@@ -24769,7 +22966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -24787,7 +22984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_NEON",
@@ -24805,7 +23002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -24832,7 +23029,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_NEON",
@@ -24850,7 +23047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -24868,7 +23065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_NEON",
@@ -24886,7 +23083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -24913,7 +23110,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_NEON",
@@ -24931,7 +23128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -24949,7 +23146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_NEON",
@@ -24967,7 +23164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -25006,7 +23203,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -25033,7 +23230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -25072,7 +23269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_Any_NEON",
@@ -25096,7 +23293,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -25120,7 +23317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_NEON",
@@ -25144,7 +23341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_Any_NEON",
@@ -25168,7 +23365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -25192,7 +23389,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_NEON",
@@ -25216,7 +23413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_NEON",
@@ -25234,7 +23431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -25252,7 +23449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_NEON",
@@ -25270,7 +23467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_Any_NEON",
@@ -25288,7 +23485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -25306,7 +23503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_NEON",
@@ -25324,7 +23521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -25351,7 +23548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_NEON",
@@ -25369,7 +23566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -25387,7 +23584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_NEON",
@@ -25405,7 +23602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -25444,7 +23641,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_Any_NEON",
@@ -25468,7 +23665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -25492,7 +23689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_NEON",
@@ -25516,7 +23713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_Any_NEON",
@@ -25534,7 +23731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -25552,7 +23749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_NEON",
@@ -25570,7 +23767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -25597,7 +23794,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -25636,7 +23833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -25663,31 +23860,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::RGBAToUVJRow_C",
-   "linker_set_key" : "RGBAToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_NEON",
@@ -25711,7 +23884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -25735,7 +23908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_NEON",
@@ -25759,7 +23932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_NEON",
@@ -25777,7 +23950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -25795,7 +23968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_NEON",
@@ -25813,7 +23986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_NEON",
@@ -25831,7 +24004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -25849,7 +24022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_NEON",
@@ -25867,7 +24040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -25897,7 +24070,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -25927,7 +24100,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -25945,7 +24118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -25981,19 +24154,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_rgb.h"
-  },
-  {
-   "function_name" : "libyuv::RiscvCpuCaps",
-   "linker_set_key" : "RiscvCpuCaps",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -26023,7 +24184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -26050,7 +24211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -26077,7 +24238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -26104,37 +24265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
-  },
-  {
-   "function_name" : "libyuv::RotatePlane_16",
-   "linker_set_key" : "RotatePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -26194,7 +24325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -26218,7 +24349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -26242,7 +24373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_Any_NEON",
@@ -26266,7 +24397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -26290,7 +24421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -26314,7 +24445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_Any_NEON",
@@ -26338,7 +24469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -26362,7 +24493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_NEON",
@@ -26383,7 +24514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -26404,7 +24535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_NEON",
@@ -26425,7 +24556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -26446,7 +24577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_NEON",
@@ -26467,7 +24598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -26488,7 +24619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_NEON",
@@ -26512,7 +24643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -26536,7 +24667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_NEON",
@@ -26560,7 +24691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -26584,7 +24715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -26602,7 +24733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_NEON",
@@ -26620,7 +24751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -26638,7 +24769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -26662,7 +24793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -26686,7 +24817,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -26710,7 +24841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -26734,7 +24865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -26758,7 +24889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -26782,7 +24913,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -26806,7 +24937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_Any_NEON",
@@ -26830,7 +24961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -26854,7 +24985,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -26878,7 +25009,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -26899,7 +25030,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -26935,46 +25066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScalePlaneDown2_16To8",
-   "linker_set_key" : "ScalePlaneDown2_16To8",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -27019,7 +25111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -27064,7 +25156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -27112,7 +25204,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -27148,7 +25240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -27184,55 +25276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -27253,7 +25297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_NEON",
@@ -27274,7 +25318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -27295,7 +25339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -27316,7 +25360,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_NEON",
@@ -27337,55 +25381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -27406,7 +25402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_NEON",
@@ -27427,7 +25423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -27448,55 +25444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -27517,7 +25465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_NEON",
@@ -27538,7 +25486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -27559,7 +25507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -27580,7 +25528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_NEON",
@@ -27601,7 +25549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -27622,7 +25570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -27643,7 +25591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -27664,7 +25612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_NEON",
@@ -27685,7 +25633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -27706,7 +25654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_NEON",
@@ -27727,7 +25675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -27748,7 +25696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -27769,7 +25717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -27790,7 +25738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_NEON",
@@ -27811,7 +25759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -27832,7 +25780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -27853,7 +25801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_NEON",
@@ -27874,7 +25822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -27895,7 +25843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_NEON",
@@ -27916,7 +25864,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -27937,7 +25885,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -27958,7 +25906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_NEON",
@@ -27979,7 +25927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -28000,7 +25948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -28021,7 +25969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_NEON",
@@ -28042,7 +25990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -28063,7 +26011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_NEON",
@@ -28087,7 +26035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -28111,7 +26059,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_NEON",
@@ -28135,7 +26083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -28159,7 +26107,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -28183,7 +26131,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_NEON",
@@ -28207,7 +26155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -28231,7 +26179,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_NEON",
@@ -28249,7 +26197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -28267,7 +26215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_NEON",
@@ -28285,7 +26233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -28303,7 +26251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -28321,7 +26269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_NEON",
@@ -28339,7 +26287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -28357,7 +26305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -28378,7 +26326,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -28414,7 +26362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -28435,7 +26383,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -28459,7 +26407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -28483,7 +26431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -28507,7 +26455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -28531,7 +26479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -28555,7 +26503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_NEON",
@@ -28576,7 +26524,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -28597,28 +26545,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2Linear_Any_NEON",
-   "linker_set_key" : "ScaleUVRowDown2Linear_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -28639,28 +26566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2_Any_NEON",
-   "linker_set_key" : "ScaleUVRowDown2_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -28681,7 +26587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -28705,7 +26611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_Any_NEON",
@@ -28729,7 +26635,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -28753,7 +26659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -28777,7 +26683,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_NEON",
@@ -28801,7 +26707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -28825,7 +26731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -28849,7 +26755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_NEON",
@@ -28873,7 +26779,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -28897,7 +26803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -28915,7 +26821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_NEON",
@@ -28933,7 +26839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -28951,7 +26857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -28969,7 +26875,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_NEON",
@@ -28987,7 +26893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -29005,7 +26911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -29029,7 +26935,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_NEON",
@@ -29047,7 +26953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -29065,7 +26971,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_NEON",
@@ -29083,7 +26989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_NEON",
@@ -29104,7 +27010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -29125,7 +27031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_NEON",
@@ -29146,7 +27052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_NEON",
@@ -29167,7 +27073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -29188,7 +27094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_NEON",
@@ -29209,7 +27115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -29233,7 +27139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_NEON",
@@ -29257,7 +27163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_NEON",
@@ -29278,7 +27184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -29299,7 +27205,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_NEON",
@@ -29320,7 +27226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -29341,7 +27247,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_NEON",
@@ -29362,7 +27268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -29407,7 +27313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_NEON",
@@ -29434,7 +27340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -29461,7 +27367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_NEON",
@@ -29488,7 +27394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -29527,7 +27433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_NEON",
@@ -29551,7 +27457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -29575,7 +27481,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_NEON",
@@ -29599,7 +27505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -29635,7 +27541,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -29668,7 +27574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -29701,7 +27607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -29734,7 +27640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -29767,7 +27673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -29800,7 +27706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -29836,7 +27742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_NEON",
@@ -29860,7 +27766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -29884,7 +27790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_NEON",
@@ -29908,7 +27814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_NEON",
@@ -29929,7 +27835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -29950,7 +27856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_NEON",
@@ -29971,7 +27877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_NEON",
@@ -29995,7 +27901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -30019,7 +27925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_NEON",
@@ -30043,7 +27949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -30058,7 +27964,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -30076,7 +27982,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_NEON",
@@ -30094,7 +28000,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -30121,7 +28027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_NEON",
@@ -30139,7 +28045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -30157,7 +28063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_NEON",
@@ -30175,55 +28081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::Transpose4x4_32_C",
-   "linker_set_key" : "Transpose4x4_32_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::Transpose4x4_32_NEON",
-   "linker_set_key" : "Transpose4x4_32_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -30250,7 +28108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_NEON",
@@ -30280,7 +28138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -30310,7 +28168,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_NEON",
@@ -30340,7 +28198,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -30373,31 +28231,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWx8_16_C",
-   "linker_set_key" : "TransposeWx8_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_NEON",
@@ -30421,7 +28255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -30445,7 +28279,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_NEON",
@@ -30469,34 +28303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWxH_16_C",
-   "linker_set_key" : "TransposeWxH_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -30523,7 +28330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -30562,7 +28369,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -30601,7 +28408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -30640,7 +28447,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -30679,7 +28486,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -30718,7 +28525,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -30757,7 +28564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -30796,7 +28603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -30835,7 +28642,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -30874,7 +28681,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -30913,7 +28720,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -30952,7 +28759,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -30991,7 +28798,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -31030,7 +28837,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -31069,7 +28876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -31096,7 +28903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_NEON",
@@ -31117,7 +28924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -31138,7 +28945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_NEON",
@@ -31159,7 +28966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -31198,7 +29005,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -31237,7 +29044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -31270,7 +29077,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_NEON",
@@ -31291,7 +29098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -31312,7 +29119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_NEON",
@@ -31333,7 +29140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_NEON",
@@ -31357,7 +29164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -31381,7 +29188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_NEON",
@@ -31405,7 +29212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -31432,7 +29239,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_NEON",
@@ -31450,7 +29257,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -31468,7 +29275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_NEON",
@@ -31486,43 +29293,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_C",
-   "linker_set_key" : "UnpackMT2T_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_NEON",
-   "linker_set_key" : "UnpackMT2T_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -31537,7 +29308,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -31564,7 +29335,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_NEON",
@@ -31585,7 +29356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -31606,7 +29377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_NEON",
@@ -31627,7 +29398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -31666,7 +29437,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -31705,7 +29476,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -31738,70 +29509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_Any_NEON",
-   "linker_set_key" : "YUY2ToNVUVRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_C",
-   "linker_set_key" : "YUY2ToNVUVRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_NEON",
-   "linker_set_key" : "YUY2ToNVUVRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_NEON",
@@ -31822,7 +29530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -31843,7 +29551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_NEON",
@@ -31864,7 +29572,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_NEON",
@@ -31888,7 +29596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -31912,7 +29620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_NEON",
@@ -31936,7 +29644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -31963,7 +29671,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_NEON",
@@ -31981,7 +29689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -31999,7 +29707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_NEON",
@@ -32017,7 +29725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -32031,7 +29739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -32044,7 +29752,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32058,7 +29766,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -32071,7 +29779,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -32093,7 +29801,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -32118,7 +29826,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -32134,7 +29842,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -32147,7 +29855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -32163,7 +29871,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -32179,7 +29887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32196,7 +29904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -32212,7 +29920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -32228,7 +29936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -32244,7 +29952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32261,7 +29969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32275,7 +29983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -32291,7 +29999,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -32307,7 +30015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -32325,7 +30033,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -32338,7 +30046,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -32354,7 +30062,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -32367,7 +30075,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -32380,7 +30088,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -32399,7 +30107,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -32412,7 +30120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -32425,7 +30133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -32438,7 +30146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -32451,7 +30159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -32460,121 +30168,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -32587,7 +30295,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32596,7 +30304,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32605,7 +30313,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32614,7 +30322,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32623,7 +30331,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -32632,7 +30340,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32641,7 +30349,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32650,7 +30358,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -32659,7 +30367,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32668,7 +30376,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -32677,16 +30385,7 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKj",
-   "name" : "const unsigned int *",
-   "referenced_type" : "_ZTIKj",
-   "self_type" : "_ZTIPKj",
-   "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32695,7 +30394,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -32704,7 +30403,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32713,7 +30412,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32722,7 +30421,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32731,7 +30430,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32740,7 +30439,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32749,7 +30448,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32758,7 +30457,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -32767,7 +30466,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32776,7 +30475,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "alignment" : 4,
@@ -32785,7 +30484,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -32794,7 +30493,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -32807,7 +30506,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 16,
@@ -32817,7 +30516,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -32827,7 +30526,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -32837,7 +30536,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -32847,7 +30546,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -32857,7 +30556,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -32867,7 +30566,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -32877,7 +30576,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -32887,7 +30586,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -32897,7 +30596,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -32926,7 +30625,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -33004,7 +30703,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 16,
@@ -33025,7 +30724,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -33046,7 +30745,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/arm64/source-based/android.hardware.audio.common@2.0.so.lsdump b/34/64/arm64/source-based/android.hardware.audio.common@2.0.so.lsdump
index 666ed2e7..3b081d05 100644
--- a/34/64/arm64/source-based/android.hardware.audio.common@2.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.audio.common@2.0.so.lsdump
@@ -2668,7 +2668,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::NONE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::BIT_IN"
     },
     {
@@ -2808,119 +2808,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2937,7 +2937,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3085,7 +3085,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -3666,7 +3666,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -3890,39 +3890,39 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_HDR"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
index 36d7ff51..bc9ee2bf 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
@@ -646,7 +646,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -654,7 +654,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
index a032d46a..f27866ad 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
@@ -3691,11 +3691,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
index 7439e7b0..39786c3e 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
@@ -3685,11 +3685,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4276,11 +4276,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4861,11 +4861,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
index 863b79fc..14039db2 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
@@ -573,7 +573,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -581,7 +581,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump
index bb71c8b7..a2939910 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump
@@ -2857,11 +2857,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump
index 9a59783d..f7f16b28 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump
@@ -2857,11 +2857,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3448,11 +3448,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump
index 1231648e..dcd05595 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump
@@ -2874,11 +2874,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3465,11 +3465,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4050,11 +4050,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
index e3cc57d0..115a7c48 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
@@ -3231,11 +3231,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
index 9c2b5f48..7a4a65f5 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
@@ -3229,11 +3229,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3820,11 +3820,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
index b7861dbf..02a8e595 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
@@ -3267,11 +3267,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3858,11 +3858,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4443,11 +4443,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump b/34/64/arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
index 55966453..21c6d45b 100644
--- a/34/64/arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
@@ -3363,11 +3363,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3954,11 +3954,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4539,11 +4539,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/android.hardware.media.omx@1.0.so.lsdump b/34/64/arm64/source-based/android.hardware.media.omx@1.0.so.lsdump
index 3a27cdb5..d1c967df 100644
--- a/34/64/arm64/source-based/android.hardware.media.omx@1.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.media.omx@1.0.so.lsdump
@@ -5061,11 +5061,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.media@1.0.so.lsdump b/34/64/arm64/source-based/android.hardware.media@1.0.so.lsdump
index 33bb237d..c613f197 100644
--- a/34/64/arm64/source-based/android.hardware.media@1.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.media@1.0.so.lsdump
@@ -2865,11 +2865,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index debd12de..85c033dd 100644
--- a/34/64/arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
+++ b/34/64/arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
@@ -3419,7 +3419,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::NONE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::BIT_IN"
     },
     {
@@ -3559,119 +3559,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3688,7 +3688,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3836,7 +3836,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -4417,7 +4417,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -4641,39 +4641,39 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_HDR"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/34/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index c6697e53..97c9ba59 100644
--- a/34/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/34/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -97,7 +97,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -232,7 +232,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -367,7 +367,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -447,7 +447,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -761,7 +761,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -847,7 +847,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -868,35 +868,10 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -3164,7 +3139,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3182,7 +3157,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3203,7 +3178,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3287,7 +3262,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3338,7 +3313,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -5068,7 +5043,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -5104,7 +5079,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -5122,7 +5097,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -5140,7 +5115,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5158,7 +5133,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -5212,7 +5187,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5221,7 +5196,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5230,7 +5205,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5275,7 +5250,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5302,7 +5277,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5329,7 +5304,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -6445,7 +6420,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -7994,7 +7969,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -8034,7 +8009,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9716,7 +9691,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9756,7 +9731,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9954,7 +9929,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -10004,7 +9979,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10014,7 +9989,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10024,7 +9999,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10034,7 +10009,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10256,32 +10231,6 @@
    "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "nregs",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "__reserved",
-     "field_offset" : 80,
-     "referenced_type" : "_ZTIA3_t"
-    }
-   ],
-   "linker_set_key" : "_ZTI10zt_context",
-   "name" : "zt_context",
-   "referenced_type" : "_ZTI10zt_context",
-   "self_type" : "_ZTI10zt_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -10337,7 +10286,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -10367,7 +10316,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10635,7 +10584,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10651,28 +10600,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "tpidr2",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "linker_set_key" : "_ZTI14tpidr2_context",
-   "name" : "tpidr2_context",
-   "referenced_type" : "_ZTI14tpidr2_context",
-   "self_type" : "_ZTI14tpidr2_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10720,7 +10648,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10762,7 +10690,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10793,7 +10721,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -10830,7 +10758,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10877,7 +10805,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -10903,7 +10831,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -10950,7 +10878,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -11104,7 +11032,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -11125,7 +11053,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -11161,7 +11089,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11313,7 +11241,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11480,7 +11408,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -11496,7 +11424,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -11517,7 +11445,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -11574,7 +11502,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11595,7 +11523,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11682,7 +11610,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11764,7 +11692,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11858,7 +11786,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -11919,7 +11847,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11935,7 +11863,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11956,7 +11884,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -12038,7 +11966,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -12059,7 +11987,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -12089,7 +12017,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -12409,7 +12337,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -15188,7 +15116,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -15210,7 +15138,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -16991,7 +16919,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -17000,7 +16928,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -17015,7 +16943,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -17024,7 +16952,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -17039,7 +16967,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -17048,7 +16976,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -17063,7 +16991,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -17072,7 +17000,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -38852,7 +38780,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -43822,7 +43750,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -43862,7 +43790,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -43872,7 +43800,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -43882,7 +43810,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -44817,7 +44745,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -44826,7 +44754,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -44918,7 +44846,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -44927,7 +44855,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm64/source-based/android.hidl.token@1.0-utils.so.lsdump b/34/64/arm64/source-based/android.hidl.token@1.0-utils.so.lsdump
index a5b8e259..f50f4bbc 100644
--- a/34/64/arm64/source-based/android.hidl.token@1.0-utils.so.lsdump
+++ b/34/64/arm64/source-based/android.hidl.token@1.0-utils.so.lsdump
@@ -5965,12 +5965,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
diff --git a/34/64/arm64/source-based/libRSCpuRef.so.lsdump b/34/64/arm64/source-based/libRSCpuRef.so.lsdump
index 23d76281..22dae3fe 100644
--- a/34/64/arm64/source-based/libRSCpuRef.so.lsdump
+++ b/34/64/arm64/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -313,7 +313,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -619,7 +619,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -744,7 +744,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "is_of_unknown_bound" : true,
@@ -4698,7 +4698,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5423,7 +5423,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5742,7 +5742,7 @@
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5850,7 +5850,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5866,11 +5866,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5879,7 +5879,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6124,35 +6124,10 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -9254,7 +9229,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9272,7 +9247,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9311,7 +9286,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9695,7 +9670,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9713,7 +9688,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9746,7 +9721,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9761,7 +9736,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9779,7 +9754,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9797,7 +9772,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9824,7 +9799,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9860,7 +9835,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9878,7 +9853,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9899,7 +9874,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9923,7 +9898,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9959,7 +9934,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9998,7 +9973,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10034,7 +10009,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10073,7 +10048,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10106,7 +10081,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10124,7 +10099,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10241,7 +10216,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10262,7 +10237,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11624,7 +11599,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11642,7 +11617,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11753,7 +11728,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -21890,7 +21865,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -21908,7 +21883,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -21917,7 +21892,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -21962,7 +21937,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -21980,7 +21955,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22052,7 +22027,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -22061,7 +22036,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -22070,7 +22045,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22079,7 +22054,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22097,7 +22072,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -22115,7 +22090,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -22133,7 +22108,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -22241,7 +22216,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22250,7 +22225,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22268,7 +22243,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22430,7 +22405,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22439,7 +22414,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22448,7 +22423,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22457,7 +22432,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22466,7 +22441,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22475,7 +22450,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22484,7 +22459,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22502,7 +22477,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22511,7 +22486,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22520,7 +22495,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22529,7 +22504,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22538,7 +22513,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22547,7 +22522,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22556,7 +22531,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22565,7 +22540,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22574,7 +22549,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22583,7 +22558,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22646,7 +22621,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22655,7 +22630,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -23123,7 +23098,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23132,7 +23107,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23186,7 +23161,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23213,7 +23188,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23258,7 +23233,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -23267,7 +23242,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -23294,7 +23269,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -23417,8 +23392,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23867,8 +23842,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26300,7 +26275,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -29936,7 +29911,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -29990,7 +29965,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -30251,7 +30226,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -30395,7 +30370,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -30476,7 +30451,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -30647,7 +30622,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30715,7 +30690,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -30765,7 +30740,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -30775,7 +30750,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30815,7 +30790,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34488,7 +34463,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 8,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34531,7 +34506,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -34801,7 +34776,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -34831,7 +34806,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -35039,7 +35014,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35089,7 +35064,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35099,7 +35074,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35109,7 +35084,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35119,7 +35094,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35554,32 +35529,6 @@
    "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "nregs",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "__reserved",
-     "field_offset" : 80,
-     "referenced_type" : "_ZTIA3_t"
-    }
-   ],
-   "linker_set_key" : "_ZTI10zt_context",
-   "name" : "zt_context",
-   "referenced_type" : "_ZTI10zt_context",
-   "self_type" : "_ZTI10zt_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -35710,7 +35659,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -35766,7 +35715,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 16,
@@ -35819,7 +35768,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35849,7 +35798,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36306,7 +36255,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 16,
@@ -36383,7 +36332,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36399,28 +36348,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "tpidr2",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "linker_set_key" : "_ZTI14tpidr2_context",
-   "name" : "tpidr2_context",
-   "referenced_type" : "_ZTI14tpidr2_context",
-   "self_type" : "_ZTI14tpidr2_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36555,7 +36483,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36699,7 +36627,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36715,7 +36643,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36746,7 +36674,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36813,7 +36741,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -36829,7 +36757,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -37034,7 +36962,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -37060,7 +36988,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -37107,7 +37035,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37149,7 +37077,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37286,7 +37214,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -37573,7 +37501,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37669,7 +37597,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37690,7 +37618,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -37726,7 +37654,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -37878,7 +37806,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -38025,7 +37953,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -38046,7 +37974,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -38275,7 +38203,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -38306,7 +38234,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38342,7 +38270,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38363,7 +38291,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38522,7 +38450,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38637,7 +38565,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -38698,7 +38626,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38714,7 +38642,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -38796,7 +38724,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38817,7 +38745,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -38847,7 +38775,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -39167,7 +39095,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -45442,7 +45370,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45523,7 +45451,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46298,7 +46226,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46315,7 +46243,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46325,7 +46253,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46342,7 +46270,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49906,7 +49834,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -49928,7 +49856,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -55496,7 +55424,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55505,7 +55433,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55520,7 +55448,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55529,7 +55457,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55544,7 +55472,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55553,7 +55481,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55568,7 +55496,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55577,7 +55505,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -128576,7 +128504,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -128585,7 +128513,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -128603,7 +128531,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
-   "name" : "std::__make_tuple_indices<2>",
+   "name" : "std::__make_tuple_indices<2, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "size" : 1,
@@ -150631,7 +150559,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -150671,7 +150599,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -150681,7 +150609,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -150691,7 +150619,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -150794,7 +150722,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -150908,7 +150836,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151022,7 +150950,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151121,7 +151049,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -152092,7 +152020,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -152101,7 +152029,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -152193,7 +152121,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -152202,7 +152130,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm64/source-based/libRSDriver.so.lsdump b/34/64/arm64/source-based/libRSDriver.so.lsdump
index c3d0a4cf..b5508f25 100644
--- a/34/64/arm64/source-based/libRSDriver.so.lsdump
+++ b/34/64/arm64/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -430,7 +430,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -457,7 +457,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -564,7 +564,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4414,7 +4414,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5151,7 +5151,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5715,7 +5715,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5731,71 +5731,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -5957,7 +5957,7 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6003,31 +6003,6 @@
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8083,7 +8058,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8101,7 +8076,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8140,7 +8115,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9883,7 +9858,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9934,7 +9909,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10281,7 +10256,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10305,7 +10280,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -10992,7 +10967,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -23038,7 +23013,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23074,7 +23049,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -23119,7 +23094,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23128,7 +23103,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -23506,7 +23481,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23515,7 +23490,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23533,7 +23508,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24172,7 +24147,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24199,7 +24174,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -24889,8 +24864,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -27637,7 +27612,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -27772,7 +27747,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -27871,7 +27846,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -28053,7 +28028,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -30191,7 +30166,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30391,7 +30366,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30401,7 +30376,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30609,7 +30584,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30619,7 +30594,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30629,7 +30604,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30639,7 +30614,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -30757,7 +30732,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -31087,32 +31062,6 @@
    "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "nregs",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "__reserved",
-     "field_offset" : 80,
-     "referenced_type" : "_ZTIA3_t"
-    }
-   ],
-   "linker_set_key" : "_ZTI10zt_context",
-   "name" : "zt_context",
-   "referenced_type" : "_ZTI10zt_context",
-   "self_type" : "_ZTI10zt_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -31184,7 +31133,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -31214,7 +31163,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -31890,7 +31839,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -31906,7 +31855,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -31940,27 +31889,6 @@
    "source_file" : "frameworks/rs/driver/rsdRuntimeStubs.cpp"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "tpidr2",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "linker_set_key" : "_ZTI14tpidr2_context",
-   "name" : "tpidr2_context",
-   "referenced_type" : "_ZTI14tpidr2_context",
-   "self_type" : "_ZTI14tpidr2_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
@@ -32129,7 +32057,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32192,7 +32120,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32254,7 +32182,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -32376,7 +32304,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32572,7 +32500,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -32598,7 +32526,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -32733,7 +32661,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -33140,7 +33068,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -33192,7 +33120,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -33228,7 +33156,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -33452,7 +33380,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -33473,7 +33401,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -33642,7 +33570,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -33663,7 +33591,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -33935,7 +33863,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -34050,7 +33978,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -34111,7 +34039,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -34295,7 +34223,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -34316,7 +34244,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -34398,7 +34326,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -34419,7 +34347,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -34480,7 +34408,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -34800,7 +34728,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "access" : "protected",
@@ -42001,7 +41929,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -42046,7 +41974,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -68053,7 +67981,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
diff --git a/34/64/arm64/source-based/libRS_internal.so.lsdump b/34/64/arm64/source-based/libRS_internal.so.lsdump
index d9741837..d5493bb6 100644
--- a/34/64/arm64/source-based/libRS_internal.so.lsdump
+++ b/34/64/arm64/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -502,7 +502,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -690,7 +690,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "is_of_unknown_bound" : true,
@@ -6164,7 +6164,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7168,7 +7168,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8224,7 +8224,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -8240,71 +8240,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8446,7 +8446,7 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8492,31 +8492,6 @@
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -8648,7 +8623,7 @@
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11606,7 +11581,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11624,7 +11599,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11663,7 +11638,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13730,7 +13705,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13787,7 +13762,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13856,7 +13831,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -31806,7 +31781,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35892,7 +35867,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -36162,7 +36137,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -36207,7 +36182,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -36234,7 +36209,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -36252,7 +36227,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36270,7 +36245,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -36396,7 +36371,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36405,7 +36380,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36423,7 +36398,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37206,7 +37181,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37233,7 +37208,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37269,7 +37244,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -37422,7 +37397,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37662,8 +37637,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37905,8 +37880,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37914,8 +37889,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37923,8 +37898,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37932,8 +37907,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40833,7 +40808,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -40905,7 +40880,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -45099,7 +45074,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -45243,7 +45218,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -45342,7 +45317,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -45463,7 +45438,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45613,7 +45588,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49641,7 +49616,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50001,7 +49976,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50011,7 +49986,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50091,7 +50066,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50209,7 +50184,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50259,7 +50234,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50269,7 +50244,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50279,7 +50254,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50289,7 +50264,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50746,32 +50721,6 @@
    "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "nregs",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "__reserved",
-     "field_offset" : 80,
-     "referenced_type" : "_ZTIA3_t"
-    }
-   ],
-   "linker_set_key" : "_ZTI10zt_context",
-   "name" : "zt_context",
-   "referenced_type" : "_ZTI10zt_context",
-   "self_type" : "_ZTI10zt_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -51154,7 +51103,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -51184,7 +51133,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -52336,7 +52285,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52352,28 +52301,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "head",
-     "referenced_type" : "_ZTI12_aarch64_ctx"
-    },
-    {
-     "field_name" : "tpidr2",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "linker_set_key" : "_ZTI14tpidr2_context",
-   "name" : "tpidr2_context",
-   "referenced_type" : "_ZTI14tpidr2_context",
-   "self_type" : "_ZTI14tpidr2_context",
-   "size" : 16,
-   "source_file" : "bionic/libc/kernel/uapi/asm-arm64/asm/sigcontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52601,7 +52529,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52955,7 +52883,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52970,7 +52898,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -53001,7 +52929,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -53212,7 +53140,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53527,7 +53455,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -53553,7 +53481,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -53674,7 +53602,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -54302,7 +54230,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -54419,7 +54347,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54471,7 +54399,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -54507,7 +54435,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -54659,7 +54587,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54816,7 +54744,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -54832,7 +54760,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -54853,7 +54781,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54874,7 +54802,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -54920,7 +54848,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55175,7 +55103,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -55206,7 +55134,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -55232,7 +55160,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55268,7 +55196,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55289,7 +55217,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55325,7 +55253,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55567,7 +55495,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55682,7 +55610,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55703,7 +55631,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55764,7 +55692,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -55852,7 +55780,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55873,7 +55801,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -55955,7 +55883,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55976,7 +55904,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -56006,7 +55934,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -56326,7 +56254,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -56598,7 +56526,7 @@
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56620,7 +56548,7 @@
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -68988,7 +68916,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -69010,7 +68938,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -73572,7 +73500,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -73581,7 +73509,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -73596,7 +73524,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -73605,7 +73533,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -73620,7 +73548,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -73629,7 +73557,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -73644,7 +73572,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -73653,7 +73581,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -126295,7 +126223,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140089,7 +140017,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -140232,7 +140160,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147945,7 +147873,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -157498,7 +157426,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -157538,7 +157466,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -157548,7 +157476,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -157558,7 +157486,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -158441,7 +158369,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -158450,7 +158378,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -158542,7 +158470,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -158551,7 +158479,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm64/source-based/libaudioutils.so.lsdump b/34/64/arm64/source-based/libaudioutils.so.lsdump
index 83c1a63c..1c531d97 100644
--- a/34/64/arm64/source-based/libaudioutils.so.lsdump
+++ b/34/64/arm64/source-based/libaudioutils.so.lsdump
@@ -1971,14 +1971,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLm5EEELm3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE25__emplace_unique_key_argsIjJRKNS_4pairIKjS6_EEEEENSK_INS_15__hash_iteratorIPNS_11__hash_nodeIS7_PvEEEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLm5EEELm3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE8__rehashEm"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112basic_stringIhNS_11char_traitsIhEENS_9allocatorIhEEE21__grow_by_and_replaceEmmmmmmPKh"
   },
   {
@@ -3186,7 +3178,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3424,119 +3416,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 2214592512,
+     "enum_field_value" : -2080374784,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : 2281701376,
+     "enum_field_value" : -2013265920,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : 2281701377,
+     "enum_field_value" : -2013265919,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : 2415919104,
+     "enum_field_value" : -1879048192,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : 2684354560,
+     "enum_field_value" : -1610612736,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3548,15 +3540,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4359,15 +4351,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 3743416319,
+     "enum_field_value" : -551550977,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4849,99 +4841,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : 2147484159,
+     "enum_field_value" : -2147483137,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : 2147484671,
+     "enum_field_value" : -2147482625,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : 2147485695,
+     "enum_field_value" : -2147481601,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : 2147487743,
+     "enum_field_value" : -2147479553,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : 2147491839,
+     "enum_field_value" : -2147475457,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : 2147500031,
+     "enum_field_value" : -2147467265,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : 2147516415,
+     "enum_field_value" : -2147450881,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : 2147549183,
+     "enum_field_value" : -2147418113,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : 2147614719,
+     "enum_field_value" : -2147352577,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : 2147745791,
+     "enum_field_value" : -2147221505,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : 2148007935,
+     "enum_field_value" : -2146959361,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : 2148532223,
+     "enum_field_value" : -2146435073,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : 2149580799,
+     "enum_field_value" : -2145386497,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : 2151677951,
+     "enum_field_value" : -2143289345,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : 2155872255,
+     "enum_field_value" : -2139095041,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : 2164260863,
+     "enum_field_value" : -2130706433,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4957,7 +4949,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5679,7 +5671,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5754,7 +5746,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5775,7 +5767,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -14889,7 +14881,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfmmmS1_S3_mN7android11audio_utils7details13FILTER_OPTIONEELm32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -16528,7 +16520,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "size" : 8,
@@ -16537,7 +16529,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 8,
@@ -16546,7 +16538,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 8,
@@ -16663,7 +16655,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 8,
@@ -21372,7 +21364,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "size" : 64,
@@ -21398,7 +21390,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 96,
@@ -21424,7 +21416,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 160,
@@ -21762,7 +21754,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/arm64/source-based/libbase.so.lsdump b/34/64/arm64/source-based/libbase.so.lsdump
index 8f06903b..20bb0355 100644
--- a/34/64/arm64/source-based/libbase.so.lsdump
+++ b/34/64/arm64/source-based/libbase.so.lsdump
@@ -1087,21 +1087,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -1960,7 +1951,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -2011,7 +2002,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2767,7 +2758,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLm500ENSt3__19allocatorIcEEE4growEm",
    "parameters" :
    [
@@ -2801,7 +2792,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLm500ENSt3__19allocatorIwEEE4growEm",
    "parameters" :
    [
@@ -4926,23 +4917,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -4961,22 +4935,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -4993,22 +4951,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
diff --git a/34/64/arm64/source-based/libbinder.so.lsdump b/34/64/arm64/source-based/libbinder.so.lsdump
index 60fb43cb..a4b19c87 100644
--- a/34/64/arm64/source-based/libbinder.so.lsdump
+++ b/34/64/arm64/source-based/libbinder.so.lsdump
@@ -73,15 +73,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA1_Ds",
-   "name" : "char16_t[1]",
-   "referenced_type" : "_ZTIDs",
-   "self_type" : "_ZTIA1_Ds",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 16,
    "linker_set_key" : "_ZTIA1_N3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>>[1]",
@@ -100,6 +91,15 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "linker_set_key" : "_ZTIA20_Ds",
+   "name" : "char16_t[20]",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIA20_Ds",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA20_m",
    "name" : "unsigned long[20]",
@@ -1085,6 +1085,34 @@
    "name" : "_ZN7android10zeroMemoryEPhm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv"
+  },
+  {
    "name" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE"
   },
   {
@@ -1856,6 +1884,214 @@
    "name" : "_ZN7android2os20ParcelFileDescriptorD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9HeapCacheEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_"
+  },
+  {
    "name" : "_ZN7android33makeDefaultRpcTransportCtxFactoryEv"
   },
   {
@@ -1940,21 +2176,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -2120,6 +2347,22 @@
    "name" : "_ZN7android4base8EndsWithENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEc"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIlEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_"
+  },
+  {
    "name" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_"
   },
   {
@@ -2135,6 +2378,22 @@
    "name" : "_ZN7android4base9ParseBoolENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintImEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b"
+  },
+  {
    "name" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvm"
   },
   {
@@ -2324,9 +2583,6 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
-   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
-  },
-  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2534,9 +2790,6 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
-   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
-  },
-  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3074,9 +3327,6 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
-   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
-  },
-  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3287,10 +3537,7 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE"
-  },
-  {
-   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3608,6 +3855,22 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedImEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
+  },
+  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3737,9 +4000,6 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
-   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
-  },
-  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3758,6 +4018,14 @@
    "name" : "_ZNK7android6Parcel16readStrongBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorImNS1_9allocatorImEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3941,6 +4209,198 @@
    "name" : "_ZNK7android6Parcel9readInt64Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
+  },
+  {
    "name" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE"
   },
   {
@@ -4047,10 +4507,394 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7__cloneEPNS0_6__baseISB_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7__cloneEPNS0_6__baseIS8_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7__cloneEPNS0_6__baseIS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7__cloneEPNS0_6__baseIS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE14__count_uniqueIS7_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEclES3_S4_S6_S6_jS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EEclEOS7_OS8_OSA_SF_OjSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_EclES5_OS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_EclES6_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_EclEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110shared_ptrIN7android6binder8internal21ClientCounterCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111__sift_downIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeESB_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRKNS_21piecewise_construct_tENS_5tupleIJRKiEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE4findIiEENS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS2_PvEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE6rehashEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeIS2_PvEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE8__rehashEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__lower_boundIRNS_6__lessIjmEENS_11__wrap_iterIPKjEEmEET0_S8_S8_RKT1_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIDsNS_9allocatorIDsEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android8String16ENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIdNS_9allocatorIdEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIfNS_9allocatorIfEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIjNS_9allocatorIjEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIlNS_9allocatorIlEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseImNS_9allocatorImEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__copy_alignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__copy_alignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__fill_n_falseINS_8__bitsetILm1ELm8EEEEEvNS_14__bit_iteratorIT_Lb0ELi0EEENS4_9size_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIDsRNS_9allocatorIDsEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EmmS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSessionEEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_7IBinderEEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4base14unique_fd_implINS2_13DefaultCloserEEERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8RpcState10BinderNode9AsyncTodoERNS_9allocatorIS4_EEEC2EmmS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8RpcState10BinderNode9AsyncTodoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEE18__construct_at_endEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEERNS5_ISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EmmS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEERNS_9allocatorIS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalIN7android8String16EEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIfRNS_9allocatorIfEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIiRNS_9allocatorIiEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIjRNS_9allocatorIjEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIlRNS_9allocatorIlEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferImRNS_9allocatorImEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4059,9 +4903,1269 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__construct_nodeIJRS5_EEENS_10unique_ptrINS_11__tree_nodeIS5_PvEENS_22__tree_node_destructorINS8_ISG_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSF_SF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE25__emplace_unique_key_argsIS5_JRS5_EEENS_4pairINS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE12__find_equalIS2_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISC_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSC_SC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE25__emplace_unique_key_argsIS2_JRKS2_EEENS_4pairINS_15__tree_iteratorIS2_PNS_11__tree_nodeIS2_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISK_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS5_JNS_4pairIKS5_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE4findIS5_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SG_EElEERPNS_15__tree_end_nodeISI_EESJ_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISI_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEEEvT_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE15__emplace_multiIJRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISQ_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_4pairIKS3_S5_EEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISN_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSI_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEENS_21__tree_const_iteratorIS6_SO_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE8__detachEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_4pairIKS3_S3_EEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISL_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_lEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_lEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE13__move_assignERSB_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS2_JRKNS_21piecewise_construct_tENS_5tupleIJOS2_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSO_SO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISW_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSW_SW_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSW_IJEEEEEENS9_INS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE4findIS7_EENS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE5eraseENS_21__tree_const_iteratorISL_PNS_11__tree_nodeISL_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE7destroyEPNS_11__tree_nodeISL_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE13__lower_boundIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEElEERKT_SM_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISK_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE25__emplace_unique_key_argsIS5_JRKNS_21piecewise_construct_tENS_5tupleIJRKS5_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE4findIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE5eraseENS_21__tree_const_iteratorISA_PNS_11__tree_nodeISA_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE7destroyEPNS_11__tree_nodeISA_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSH_SH_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsImJNS_4pairIKmS4_EEEEENSE_INS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE24__emplace_back_slow_pathIJDsEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE26__swap_out_circular_bufferERNS_14__split_bufferIDsRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE21__push_back_slow_pathIRKS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSessionEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE18__construct_at_endEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6assignIPS2_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS2_NS_15iterator_traitsIS9_E9referenceEEE5valueEvE4typeES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIS6_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE21__push_back_slow_pathISA_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE26__swap_out_circular_bufferERNS_14__split_bufferISA_RSC_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE21__push_back_slow_pathIS8_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE24__emplace_back_slow_pathIJS6_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RSA_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE12__move_rangeEPS1_S5_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertENS_11__wrap_iterIPKS1_EEmRS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPKS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS9_E9referenceEEE5valueENS_11__wrap_iterIPS1_EEE4typeENSD_IS7_EES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIS6_EEE4typeENSC_IPKS1_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELm0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELm0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE9push_backERKb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6assignIPdEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIdNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE26__swap_out_circular_bufferERNS_14__split_bufferIfRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6assignIPiEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIRKjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE26__swap_out_circular_bufferERNS_14__split_bufferIjRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE26__swap_out_circular_bufferERNS_14__split_bufferIlRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE6assignIPlEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIlNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorImNS_9allocatorImEEE26__swap_out_circular_bufferERNS_14__split_bufferImRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorImNS_9allocatorImEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorImNS_9allocatorImEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__19__sift_upIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "_ZThn8_N7android10AllocationD0Ev"
   },
   {
@@ -4323,9 +6427,15 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
+   "name" : "_ZN7android16kEnableRecordingE"
+  },
+  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
+   "name" : "_ZN7android20kEnableRpcDevServersE"
+  },
+  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -4762,6 +6872,10 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android10PoolThreadE"
+  },
+  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -4789,6 +6903,10 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android15BpShellCallbackE"
+  },
+  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -4798,6 +6916,14 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android16BpResultReceiverE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
+  },
+  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -4861,6 +6987,14 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -4929,10 +7063,6 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTVN7android15RpcTransportRawE"
-  },
-  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -4956,10 +7086,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android18RpcTransportCtxRawE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -6528,7 +8654,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -6579,7 +8705,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -10966,6 +13092,104 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemoryHeap>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IShellCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IResultReceiver>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IClientCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceManager>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemory>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
    "function_name" : "android::IMemoryHeap::asInterface",
    "linker_set_key" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE",
    "parameters" :
@@ -13451,6 +15675,849 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::WaitForShutdownListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession23WaitForShutdownListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_12ProcessStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12ProcessStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_12ProcessStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15BpShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android15BpShellCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_16BpResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android16BpResultReceiverE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager::LocalRegistrationCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShimEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android18ServiceManagerShimE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::BufferedTextOutput::BufferState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18BufferedTextOutput11BufferStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os17BpServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os17BpServiceCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::binder::internal::ClientCounterCallbackImpl>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7BBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::clear",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpBinderE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android10AllocationE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpMemoryE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::HeapCache>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_9HeapCacheEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9HeapCacheEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::clear",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h",
+   "template_args" :
+   [
+    "_ZTIN7android10RpcSession23WaitForShutdownListenerE"
+   ]
+  },
+  {
+   "function_name" : "android::wp<android::IBinder::DeathRecipient>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinder14DeathRecipientEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinder14DeathRecipientEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinder14DeathRecipientEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::base::LogMessage::stream",
    "linker_set_key" : "_ZN7android4base10LogMessage6streamEv",
    "parameters" :
@@ -13972,23 +17039,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -14007,22 +17057,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -14039,22 +17073,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
@@ -14703,6 +17721,114 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIa"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIlEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPl"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIl"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIl"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIs"
+   ]
+  },
+  {
    "function_name" : "android::base::Readlink",
    "linker_set_key" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_",
    "parameters" :
@@ -14775,6 +17901,114 @@
    "source_file" : "system/libbase/include/android-base/parsebool.h"
   },
   {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIh"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIj"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintImEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPm"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIm"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIt"
+   ]
+  },
+  {
    "function_name" : "android::base::ReadFully",
    "linker_set_key" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvm",
    "parameters" :
@@ -15800,19 +19034,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::setServiceFuzzing",
-   "linker_set_key" : "_ZN7android6Parcel17setServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::writeDoubleVector",
    "linker_set_key" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -16920,12 +20141,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
   },
   {
-   "function_name" : "android::binder::LazyServiceRegistrar::createExtraTestInstance",
-   "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv",
-   "return_type" : "_ZTIN7android6binder20LazyServiceRegistrarE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
-  },
-  {
    "function_name" : "android::binder::LazyServiceRegistrar::setActiveServicesCallback",
    "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE",
    "parameters" :
@@ -17720,7 +20935,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -17734,7 +20948,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -19535,7 +22748,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIb",
+   "return_type" : "_ZTIv",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -19681,7 +22894,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE",
    "parameters" :
    [
     {
@@ -19689,23 +22902,7 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "function_name" : "android::RpcServer::setServerSocketModifier",
-   "linker_set_key" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android9RpcServerE"
-    },
-    {
-     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21621,19 +24818,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::isServiceFuzzing",
-   "linker_set_key" : "_ZNK7android6Parcel16isServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPKN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::readDoubleVector",
    "linker_set_key" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -21724,6 +24908,46 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os15IClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16IServiceCallbackE"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::readUint64Vector",
    "linker_set_key" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorImNS1_9allocatorImEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -22672,6 +25896,1062 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "function_name" : "android::binder::debug::RecordedTransaction::dumpToFile",
    "linker_set_key" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE",
    "parameters" :
@@ -23502,10 +27782,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA1_KDs",
-   "name" : "const char16_t (&)[1]",
-   "referenced_type" : "_ZTIA1_KDs",
-   "self_type" : "_ZTIRA1_KDs",
+   "linker_set_key" : "_ZTIRA20_KDs",
+   "name" : "const char16_t (&)[20]",
+   "referenced_type" : "_ZTIA20_KDs",
+   "self_type" : "_ZTIRA20_KDs",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -23711,7 +27991,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm64_armv8-a_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.UpsideDownCake_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -24411,10 +28691,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
-   "name" : "const android::String16::StaticData<1> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
+   "name" : "const android::String16::StaticData<20> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -26441,8 +30721,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm64_armv8-a_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm64_armv8-a_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.UpsideDownCake_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.UpsideDownCake_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29139,10 +33419,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILm1EEE",
-   "name" : "android::StaticString16<1> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILm1EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILm20EEE",
+   "name" : "android::StaticString16<20> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILm20EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -29823,15 +34103,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession> *",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android2wpINS_7BBinderEEE",
    "name" : "android::wp<android::BBinder> *",
    "referenced_type" : "_ZTIN7android2wpINS_7BBinderEEE",
@@ -30462,10 +34733,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm1EEE",
-   "name" : "android::String16::StaticData<1> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILm1EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm20EEE",
+   "name" : "android::String16::StaticData<20> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILm20EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -31307,16 +35578,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA1_KDs",
-   "name" : "const char16_t[1]",
-   "referenced_type" : "_ZTIA1_Ds",
-   "self_type" : "_ZTIA1_KDs",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIA1_KPKc",
@@ -31327,6 +35588,16 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIA20_KDs",
+   "name" : "const char16_t[20]",
+   "referenced_type" : "_ZTIA20_Ds",
+   "self_type" : "_ZTIA20_KDs",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Km",
@@ -33595,11 +37866,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm1EEE",
-   "name" : "const android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm20EEE",
+   "name" : "const android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -33719,7 +37990,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 448,
+   "size" : 400,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -35130,46 +39401,6 @@
      "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android15RpcTransportRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportCtxRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android18RpcTransportCtxRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
    "name" : "libutilsinternal::is_complete_type<android::Parcel, void>",
    "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
@@ -46667,15 +50898,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILm1EEE",
-   "name" : "android::StaticString16<1>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILm20EEE",
+   "name" : "android::StaticString16<20>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILm1EEE",
-   "size" : 16,
+   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILm20EEE",
+   "size" : 56,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -50146,7 +54377,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -50196,34 +54427,6 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android10RpcSessionE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android7RefBase12weakref_typeE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "size" : 16,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android10RpcSessionE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "_ZTIPN7android7BBinderE"
     },
     {
@@ -57706,12 +61909,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -59819,14 +64016,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA1_Ds"
+     "referenced_type" : "_ZTIA20_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "name" : "android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "name" : "android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -60268,7 +64465,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 1280,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
     },
     {
      "access" : "private",
@@ -60278,32 +64475,26 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServerSocketModifier",
-     "field_offset" : 2048,
-     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
-    },
-    {
-     "access" : "private",
      "field_name" : "mSessions",
-     "field_offset" : 2432,
+     "field_offset" : 2048,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 2624,
+     "field_offset" : 2240,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 2688,
+     "field_offset" : 2304,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 3072,
+     "field_offset" : 2688,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -60312,12 +64503,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 448,
+   "size" : 400,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 432,
+     "component_value" : 384,
      "kind" : "vbase_offset"
     },
     {
@@ -60354,11 +64545,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -432,
+     "component_value" : -384,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -432,
+     "component_value" : -384,
      "kind" : "offset_to_top"
     },
     {
@@ -61505,10 +65696,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE",
-   "name" : "std::function<sp<IBinder> (wp<RpcSession>, const void *, unsigned long)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE",
-   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE",
+   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE",
+   "name" : "std::function<sp<IBinder> (const void *, unsigned long)> &&",
+   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE",
+   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE",
    "size" : 8,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -61541,15 +65732,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "name" : "std::function<void (borrowed_fd)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "self_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "size" : 8,
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "name" : "std::function<void (LogId, LogSeverity, const char *, const char *, unsigned int, const char *)> &&",
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
diff --git a/34/64/arm64/source-based/libc++.so.lsdump b/34/64/arm64/source-based/libc++.so.lsdump
index 88bbf631..0526ac5a 100644
--- a/34/64/arm64/source-based/libc++.so.lsdump
+++ b/34/64/arm64/source-based/libc++.so.lsdump
@@ -2615,6 +2615,14 @@
    "name" : "_ZNSt3__112__next_primeEm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__112__rs_defaultC1ERKS0_"
   },
   {
@@ -3777,6 +3785,10 @@
    "name" : "_ZNSt3__114__num_put_base18__identify_paddingEPcS1_RKNS_8ios_baseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__114__shared_count12__add_sharedEv"
   },
   {
@@ -4417,10 +4429,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_"
   },
   {
@@ -4436,6 +4472,22 @@
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIssEEPsEEvT0_S5_T_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_"
+  },
+  {
    "name" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE"
   },
   {
@@ -4611,6 +4663,10 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEclEv"
+  },
+  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -4999,10 +5055,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_"
   },
   {
@@ -5019,10 +5099,50 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_"
   },
   {
@@ -5039,6 +5159,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9815,7 +9951,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_grouping",
+   "function_name" : "std::moneypunct<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9829,7 +9965,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_neg_format",
+   "function_name" : "std::moneypunct<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9843,7 +9979,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_pos_format",
+   "function_name" : "std::moneypunct<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9857,7 +9993,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9871,7 +10007,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_frac_digits",
+   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9885,7 +10021,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_decimal_point",
+   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -9899,7 +10035,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_negative_sign",
+   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -9913,7 +10049,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_positive_sign",
+   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -9927,7 +10063,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10067,7 +10203,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10081,7 +10217,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10095,7 +10231,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10109,7 +10245,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10123,7 +10259,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10137,7 +10273,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10151,7 +10287,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10165,7 +10301,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10179,7 +10315,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13098,7 +13234,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13112,7 +13248,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13126,7 +13262,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13140,7 +13276,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13154,7 +13290,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13168,7 +13304,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13182,7 +13318,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13196,7 +13332,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13210,7 +13346,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13350,7 +13486,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13364,7 +13500,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13378,7 +13514,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13392,7 +13528,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13406,7 +13542,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13420,7 +13556,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13434,7 +13570,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13448,7 +13584,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13462,7 +13598,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20193,6 +20329,50 @@
    "source_file" : "external/libcxx/include/__hash_table"
   },
   {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPcEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPcEE"
+   ]
+  },
+  {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__rs_default::__rs_default",
    "linker_set_key" : "_ZNSt3__112__rs_defaultC1ERKS0_",
    "parameters" :
@@ -25623,6 +25803,25 @@
    "source_file" : "external/libcxx/include/locale"
   },
   {
+   "function_name" : "std::__rotate_right",
+   "linker_set_key" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__shared_count::__add_shared",
    "linker_set_key" : "_ZNSt3__114__shared_count12__add_sharedEv",
    "parameters" :
@@ -28373,7 +28572,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char>::init",
+   "function_name" : "std::moneypunct_byname<char, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28407,7 +28606,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28441,6 +28640,121 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_",
    "parameters" :
    [
@@ -28464,6 +28778,29 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_",
    "parameters" :
    [
@@ -28555,6 +28892,98 @@
    ]
   },
   {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "access" : "private",
    "function_name" : "std::__time_get_storage<char>::init",
    "linker_set_key" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE",
@@ -29366,6 +29795,19 @@
    "source_file" : "external/libcxx/include/memory"
   },
   {
+   "function_name" : "std::mersenne_twister_engine<unsigned long, 32, 624, 397, 31, 2567483615, 11, 4294967295, 7, 2636928640, 15, 4022730752, 18, 1812433253>::operator()",
+   "linker_set_key" : "_ZNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEclEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEE"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "external/libcxx/include/random"
+  },
+  {
    "function_name" : "std::__libcpp_debug_exception::__libcpp_debug_exception",
    "linker_set_key" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE",
    "parameters" :
@@ -31406,6 +31848,136 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31432,6 +32004,32 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31535,6 +32133,255 @@
    ]
   },
   {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
    "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_",
    "parameters" :
@@ -31565,6 +32412,35 @@
   },
   {
    "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_",
    "parameters" :
    [
@@ -31680,6 +32556,122 @@
    ]
   },
   {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "function_name" : "std::__sort5",
    "linker_set_key" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -34564,13 +35556,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char>::id",
+   "name" : "std::moneypunct<char, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char>::intl",
+   "name" : "std::moneypunct<char, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -34588,13 +35580,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t>::id",
+   "name" : "std::moneypunct<wchar_t, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t>::intl",
+   "name" : "std::moneypunct<wchar_t, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -54401,7 +55393,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -54410,7 +55402,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -54425,7 +55417,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -54434,7 +55426,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -54449,7 +55441,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -54458,7 +55450,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -54473,7 +55465,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -54482,7 +55474,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -115774,7 +116766,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -115783,7 +116775,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -136287,7 +137279,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -136297,7 +137289,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
-   "name" : "std::ratio<1000000>",
+   "name" : "std::ratio<1000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
@@ -136337,7 +137329,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -136347,7 +137339,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -136357,7 +137349,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -137608,7 +138600,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -137617,7 +138609,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137626,7 +138618,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
    "size" : 1,
@@ -137640,7 +138632,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137649,7 +138641,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137686,7 +138678,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137695,7 +138687,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137732,7 +138724,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137741,7 +138733,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137778,7 +138770,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137787,7 +138779,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137824,7 +138816,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137833,7 +138825,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137870,7 +138862,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -137879,7 +138871,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137948,7 +138940,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137957,7 +138949,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137994,7 +138986,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -138003,7 +138995,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138072,7 +139064,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000ELb0EEE",
    "size" : 1,
@@ -138081,7 +139073,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138196,7 +139188,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138205,7 +139197,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
diff --git a/34/64/arm64/source-based/libcap.so.lsdump b/34/64/arm64/source-based/libcap.so.lsdump
index d1030418..da898048 100644
--- a/34/64/arm64/source-based/libcap.so.lsdump
+++ b/34/64/arm64/source-based/libcap.so.lsdump
@@ -60,6 +60,9 @@
  "elf_functions" :
  [
   {
+   "name" : "_libcap_strdup"
+  },
+  {
    "name" : "cap_clear"
   },
   {
@@ -87,9 +90,6 @@
    "name" : "cap_fill"
   },
   {
-   "name" : "cap_fill_flag"
-  },
-  {
    "name" : "cap_free"
   },
   {
@@ -132,21 +132,12 @@
    "name" : "cap_get_secbits"
   },
   {
-   "name" : "cap_iab_compare"
-  },
-  {
-   "name" : "cap_iab_dup"
-  },
-  {
    "name" : "cap_iab_fill"
   },
   {
    "name" : "cap_iab_from_text"
   },
   {
-   "name" : "cap_iab_get_pid"
-  },
-  {
    "name" : "cap_iab_get_proc"
   },
   {
@@ -204,9 +195,6 @@
    "name" : "cap_prctlw"
   },
   {
-   "name" : "cap_proc_root"
-  },
-  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -544,27 +532,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_fill_flag",
-   "linker_set_key" : "cap_fill_flag",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    },
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_free",
    "linker_set_key" : "cap_free",
    "parameters" :
@@ -727,33 +694,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_compare",
-   "linker_set_key" : "cap_iab_compare",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    },
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
-   "function_name" : "cap_iab_dup",
-   "linker_set_key" : "cap_iab_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_fill",
    "linker_set_key" : "cap_iab_fill",
    "parameters" :
@@ -787,18 +727,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_get_pid",
-   "linker_set_key" : "cap_iab_get_pid",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_get_proc",
    "linker_set_key" : "cap_iab_get_proc",
    "return_type" : "_ZTIP9cap_iab_s",
@@ -906,7 +834,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -921,7 +849,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -951,7 +879,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -972,7 +900,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -987,7 +915,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1081,18 +1009,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_proc_root",
-   "linker_set_key" : "cap_proc_root",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPc",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_reset_ambient",
    "linker_set_key" : "cap_reset_ambient",
    "return_type" : "_ZTIi",
diff --git a/34/64/arm64/source-based/libcodec2.so.lsdump b/34/64/arm64/source-based/libcodec2.so.lsdump
index 9fc3ad4e..a293d0ac 100644
--- a/34/64/arm64/source-based/libcodec2.so.lsdump
+++ b/34/64/arm64/source-based/libcodec2.so.lsdump
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1269,7 +1269,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -1285,11 +1285,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -1298,7 +1298,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1755,7 +1755,7 @@
      "name" : "C2FrameData::FLAG_CORRUPT"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
    ],
@@ -2493,7 +2493,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 18446744073709551600,
+     "enum_field_value" : -16,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3619,7 +3619,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3977,7 +3977,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_MASK"
     },
     {
@@ -3989,11 +3989,11 @@
      "name" : "C2Param::CoreIndex::KIND_TUNING"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2Param::CoreIndex::KIND_SETTING"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4281,11 +4281,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -5896,7 +5896,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2Setting::PARAM_KIND"
     }
    ],
@@ -5924,7 +5924,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -5942,7 +5942,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5975,7 +5975,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5990,7 +5990,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6008,7 +6008,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6026,7 +6026,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6053,7 +6053,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6074,7 +6074,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6092,7 +6092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6113,7 +6113,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6137,7 +6137,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6173,7 +6173,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6212,7 +6212,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6248,7 +6248,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6287,7 +6287,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6320,7 +6320,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6338,7 +6338,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6359,7 +6359,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6380,7 +6380,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   }
  ],
  "functions" : [],
@@ -6703,7 +6703,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -6712,7 +6712,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -6757,7 +6757,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -6766,7 +6766,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -6946,7 +6946,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7018,7 +7018,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7225,7 +7225,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7234,7 +7234,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7243,7 +7243,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7252,7 +7252,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7261,7 +7261,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7270,7 +7270,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7279,7 +7279,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7288,7 +7288,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7297,7 +7297,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7306,7 +7306,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7315,7 +7315,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7324,7 +7324,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7333,7 +7333,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7342,7 +7342,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7351,7 +7351,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7360,7 +7360,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7369,7 +7369,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7378,7 +7378,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7387,7 +7387,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7414,7 +7414,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7450,7 +7450,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7495,7 +7495,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7783,7 +7783,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7792,7 +7792,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7801,7 +7801,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -8166,7 +8166,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -8226,7 +8226,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8276,7 +8276,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -9021,7 +9021,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -9077,7 +9077,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -9561,7 +9561,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -10029,7 +10029,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10621,7 +10621,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10988,7 +10988,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/arm64/source-based/libcrypto.so.lsdump b/34/64/arm64/source-based/libcrypto.so.lsdump
index 4f01be70..524bf5c5 100644
--- a/34/64/arm64/source-based/libcrypto.so.lsdump
+++ b/34/64/arm64/source-based/libcrypto.so.lsdump
@@ -38,6 +38,15 @@
    "source_file" : "external/boringssl/src/include/openssl/cipher.h"
   },
   {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA16_m",
+   "name" : "unsigned long[16]",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIA16_m",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1808_h",
    "name" : "unsigned char[1808]",
@@ -120,11 +129,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -594,9 +603,6 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
-   "name" : "ASN1_TIME_set_string_X509"
-  },
-  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1848,6 +1854,18 @@
    "name" : "CRYPTO_MUTEX_unlock_write"
   },
   {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_write"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_write"
+  },
+  {
    "name" : "CRYPTO_THREADID_current"
   },
   {
@@ -2592,18 +2610,6 @@
    "name" : "EC_get_builtin_curves"
   },
   {
-   "name" : "EC_group_p224"
-  },
-  {
-   "name" : "EC_group_p256"
-  },
-  {
-   "name" : "EC_group_p384"
-  },
-  {
-   "name" : "EC_group_p521"
-  },
-  {
    "name" : "EC_hash_to_curve_p256_xmd_sha256_sswu"
   },
   {
@@ -3060,15 +3066,6 @@
    "name" : "EVP_HPKE_CTX_seal"
   },
   {
-   "name" : "EVP_HPKE_CTX_setup_auth_recipient"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing"
-  },
-  {
    "name" : "EVP_HPKE_CTX_setup_recipient"
   },
   {
@@ -3504,9 +3501,6 @@
    "name" : "EVP_aead_aes_128_cbc_sha1_tls_implicit_iv"
   },
   {
-   "name" : "EVP_aead_aes_128_cbc_sha256_tls"
-  },
-  {
    "name" : "EVP_aead_aes_128_ccm_bluetooth"
   },
   {
@@ -3726,9 +3720,6 @@
    "name" : "EVP_sha256"
   },
   {
-   "name" : "EVP_sha256_final_with_secret_suffix"
-  },
-  {
    "name" : "EVP_sha384"
   },
   {
@@ -4176,69 +4167,6 @@
    "name" : "OPENSSL_secure_malloc"
   },
   {
-   "name" : "OPENSSL_sk_deep_copy"
-  },
-  {
-   "name" : "OPENSSL_sk_delete"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_if"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_ptr"
-  },
-  {
-   "name" : "OPENSSL_sk_dup"
-  },
-  {
-   "name" : "OPENSSL_sk_find"
-  },
-  {
-   "name" : "OPENSSL_sk_free"
-  },
-  {
-   "name" : "OPENSSL_sk_insert"
-  },
-  {
-   "name" : "OPENSSL_sk_is_sorted"
-  },
-  {
-   "name" : "OPENSSL_sk_new"
-  },
-  {
-   "name" : "OPENSSL_sk_new_null"
-  },
-  {
-   "name" : "OPENSSL_sk_num"
-  },
-  {
-   "name" : "OPENSSL_sk_pop"
-  },
-  {
-   "name" : "OPENSSL_sk_pop_free_ex"
-  },
-  {
-   "name" : "OPENSSL_sk_push"
-  },
-  {
-   "name" : "OPENSSL_sk_set"
-  },
-  {
-   "name" : "OPENSSL_sk_set_cmp_func"
-  },
-  {
-   "name" : "OPENSSL_sk_shift"
-  },
-  {
-   "name" : "OPENSSL_sk_sort"
-  },
-  {
-   "name" : "OPENSSL_sk_value"
-  },
-  {
-   "name" : "OPENSSL_sk_zero"
-  },
-  {
    "name" : "OPENSSL_strcasecmp"
   },
   {
@@ -4845,27 +4773,6 @@
    "name" : "RSA_new_method"
   },
   {
-   "name" : "RSA_new_method_no_e"
-  },
-  {
-   "name" : "RSA_new_private_key"
-  },
-  {
-   "name" : "RSA_new_private_key_large_e"
-  },
-  {
-   "name" : "RSA_new_private_key_no_crt"
-  },
-  {
-   "name" : "RSA_new_private_key_no_e"
-  },
-  {
-   "name" : "RSA_new_public_key"
-  },
-  {
-   "name" : "RSA_new_public_key_large_e"
-  },
-  {
    "name" : "RSA_padding_add_PKCS1_OAEP_mgf1"
   },
   {
@@ -7455,9 +7362,36 @@
    "name" : "s2i_ASN1_OCTET_STRING"
   },
   {
+   "name" : "sk_deep_copy"
+  },
+  {
+   "name" : "sk_delete"
+  },
+  {
+   "name" : "sk_delete_if"
+  },
+  {
+   "name" : "sk_delete_ptr"
+  },
+  {
+   "name" : "sk_dup"
+  },
+  {
+   "name" : "sk_find"
+  },
+  {
    "name" : "sk_free"
   },
   {
+   "name" : "sk_insert"
+  },
+  {
+   "name" : "sk_is_sorted"
+  },
+  {
+   "name" : "sk_new"
+  },
+  {
    "name" : "sk_new_null"
   },
   {
@@ -7476,9 +7410,24 @@
    "name" : "sk_push"
   },
   {
+   "name" : "sk_set"
+  },
+  {
+   "name" : "sk_set_cmp_func"
+  },
+  {
+   "name" : "sk_shift"
+  },
+  {
+   "name" : "sk_sort"
+  },
+  {
    "name" : "sk_value"
   },
   {
+   "name" : "sk_zero"
+  },
+  {
    "name" : "v2i_GENERAL_NAME"
   },
   {
@@ -8543,23 +8492,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8923,30 +8872,6 @@
      "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
     },
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
-   "name" : "int (int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
-    },
-    {
      "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -10447,21 +10372,6 @@
    "source_file" : "external/boringssl/src/include/openssl/asn1.h"
   },
   {
-   "function_name" : "ASN1_TIME_set_string_X509",
-   "linker_set_key" : "ASN1_TIME_set_string_X509",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
    "function_name" : "ASN1_TIME_to_generalizedtime",
    "linker_set_key" : "ASN1_TIME_to_generalizedtime",
    "parameters" :
@@ -16339,21 +16249,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
-   "function_name" : "EC_get_builtin_curves",
-   "linker_set_key" : "EC_get_builtin_curves",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP16EC_builtin_curve"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
    "function_name" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "linker_set_key" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "parameters" :
@@ -17413,135 +17308,6 @@
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
    "function_name" : "EVP_HPKE_CTX_setup_recipient",
    "linker_set_key" : "EVP_HPKE_CTX_setup_recipient",
    "parameters" :
@@ -19426,12 +19192,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "linker_set_key" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -20956,318 +20716,6 @@
    "source_file" : "external/boringssl/src/include/openssl/mem.h"
   },
   {
-   "function_name" : "OPENSSL_sk_deep_copy",
-   "linker_set_key" : "OPENSSL_sk_deep_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPKvE"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete",
-   "linker_set_key" : "OPENSSL_sk_delete",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_if",
-   "linker_set_key" : "OPENSSL_sk_delete_if",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPvS_E"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_ptr",
-   "linker_set_key" : "OPENSSL_sk_delete_ptr",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_dup",
-   "linker_set_key" : "OPENSSL_sk_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_find",
-   "linker_set_key" : "OPENSSL_sk_find",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_free",
-   "linker_set_key" : "OPENSSL_sk_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_insert",
-   "linker_set_key" : "OPENSSL_sk_insert",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_is_sorted",
-   "linker_set_key" : "OPENSSL_sk_is_sorted",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new",
-   "linker_set_key" : "OPENSSL_sk_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new_null",
-   "linker_set_key" : "OPENSSL_sk_new_null",
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_num",
-   "linker_set_key" : "OPENSSL_sk_num",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop",
-   "linker_set_key" : "OPENSSL_sk_pop",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop_free_ex",
-   "linker_set_key" : "OPENSSL_sk_pop_free_ex",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_push",
-   "linker_set_key" : "OPENSSL_sk_push",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set",
-   "linker_set_key" : "OPENSSL_sk_set",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set_cmp_func",
-   "linker_set_key" : "OPENSSL_sk_set_cmp_func",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIPFiPKPKvS2_E",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_shift",
-   "linker_set_key" : "OPENSSL_sk_shift",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_sort",
-   "linker_set_key" : "OPENSSL_sk_sort",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_value",
-   "linker_set_key" : "OPENSSL_sk_value",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_zero",
-   "linker_set_key" : "OPENSSL_sk_zero",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
    "function_name" : "OPENSSL_strcasecmp",
    "linker_set_key" : "OPENSSL_strcasecmp",
    "parameters" :
@@ -27783,10 +27231,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27855,7 +27303,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29871,7 +29319,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30660,7 +30108,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31905,7 +31353,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31926,7 +31374,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -36280,6 +35728,114 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
+   "function_name" : "sk_deep_copy",
+   "linker_set_key" : "sk_deep_copy",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPKvE"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPFvPvES_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPvE"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete",
+   "linker_set_key" : "sk_delete",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_if",
+   "linker_set_key" : "sk_delete_if",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPvS_E"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_ptr",
+   "linker_set_key" : "sk_delete_ptr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_dup",
+   "linker_set_key" : "sk_dup",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_find",
+   "linker_set_key" : "sk_find",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPm"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_free",
    "linker_set_key" : "sk_free",
    "parameters" :
@@ -36292,6 +35848,48 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_insert",
+   "linker_set_key" : "sk_insert",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_is_sorted",
+   "linker_set_key" : "sk_is_sorted",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_new",
+   "linker_set_key" : "sk_new",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_new_null",
    "linker_set_key" : "sk_new_null",
    "return_type" : "_ZTIP8stack_st",
@@ -36370,6 +35968,66 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_set",
+   "linker_set_key" : "sk_set",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_set_cmp_func",
+   "linker_set_key" : "sk_set_cmp_func",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIPFiPKPKvS2_E",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_shift",
+   "linker_set_key" : "sk_shift",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_sort",
+   "linker_set_key" : "sk_sort",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_value",
    "linker_set_key" : "sk_value",
    "parameters" :
@@ -36385,6 +36043,18 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_zero",
+   "linker_set_key" : "sk_zero",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "v2i_GENERAL_NAME",
    "linker_set_key" : "v2i_GENERAL_NAME",
    "parameters" :
@@ -37215,6 +36885,24 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
+   "name" : "bn_mont_ctx_st *",
+   "referenced_type" : "_ZTI14bn_mont_ctx_st",
+   "self_type" : "_ZTIP14bn_mont_ctx_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIP14private_key_st",
    "name" : "private_key_st *",
    "referenced_type" : "_ZTI14private_key_st",
@@ -37332,15 +37020,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP16EC_builtin_curve",
-   "name" : "EC_builtin_curve *",
-   "referenced_type" : "_ZTI16EC_builtin_curve",
-   "self_type" : "_ZTIP16EC_builtin_curve",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP16HRSS_private_key",
    "name" : "HRSS_private_key *",
    "referenced_type" : "_ZTI16HRSS_private_key",
@@ -38232,10 +37911,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *, const void *)",
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "self_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
+   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38387,15 +38066,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
    "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
-   "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
    "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 8,
@@ -38666,15 +38336,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 8,
@@ -39456,15 +39117,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKl",
-   "name" : "const long *",
-   "referenced_type" : "_ZTIKl",
-   "self_type" : "_ZTIPKl",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKm",
    "name" : "const unsigned long *",
    "referenced_type" : "_ZTIKm",
@@ -39479,7 +39131,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -39672,6 +39324,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPP14trust_token_st",
    "name" : "trust_token_st **",
    "referenced_type" : "_ZTIP14trust_token_st",
@@ -40073,7 +39734,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -40145,7 +39806,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/bio.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   }
  ],
  "qualified_types" :
@@ -40207,7 +39868,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 544,
+   "size" : 392,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40529,7 +40190,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40549,7 +40210,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 88,
+   "size" : 72,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40949,15 +40610,17 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 128,
+   "size" : 144,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 240,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -41081,16 +40744,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKl",
-   "name" : "const long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIKl",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKm",
    "name" : "const unsigned long",
    "referenced_type" : "_ZTIm",
@@ -41104,7 +40757,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   }
  ],
  "record_types" :
@@ -41347,42 +41000,6 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump"
-    },
-    {
-     "field_name" : "enc_offset",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_AUX_st",
-   "name" : "ASN1_AUX_st",
-   "referenced_type" : "_ZTI11ASN1_AUX_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTI11ASN1_AUX_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "size" : 32,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "app_data",
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "ref_offset",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "asn1_cb",
-     "field_offset" : 128,
      "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -42532,7 +42149,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42540,7 +42157,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42568,22 +42185,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5056,
+     "field_offset" : 5184,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5632,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42591,7 +42208,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42884,7 +42501,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIA128_h"
+     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
     },
     {
      "field_name" : "block_used",
@@ -43414,7 +43031,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -43426,7 +43043,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43615,6 +43232,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 416,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 448,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 672,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 1152,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 1216,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 1280,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 1344,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 1408,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 1472,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 1600,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 1664,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 1728,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1792,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1856,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 240,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 40,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPm"
     },
@@ -43895,6 +43755,28 @@
    "source_file" : "external/boringssl/src/include/openssl/kyber.h"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "bytes",
+     "referenced_type" : "_ZTIA128_h"
+    },
+    {
+     "field_name" : "words",
+     "referenced_type" : "_ZTIA16_m"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN16blake2b_state_stUt_E",
+   "name" : "blake2b_state_st::(unnamed)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN16blake2b_state_stUt_E",
+   "self_type" : "_ZTIN16blake2b_state_stUt_E",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 2,
    "fields" :
    [
diff --git a/34/64/arm64/source-based/libcrypto_utils.so.lsdump b/34/64/arm64/source-based/libcrypto_utils.so.lsdump
index 4f48f008..305a6ec1 100644
--- a/34/64/arm64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/arm64/source-based/libcrypto_utils.so.lsdump
@@ -137,11 +137,13 @@
  "qualified_types" :
  [
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 240,
    "source_file" : "system/core/libcrypto_utils/include/crypto_utils/android_pubkey.h"
   },
   {
diff --git a/34/64/arm64/source-based/libcurl.so.lsdump b/34/64/arm64/source-based/libcurl.so.lsdump
index 1ad75434..f48a0855 100644
--- a/34/64/arm64/source-based/libcurl.so.lsdump
+++ b/34/64/arm64/source-based/libcurl.so.lsdump
@@ -113,6 +113,12 @@
    "name" : "Curl_all_content_encodings"
   },
   {
+   "name" : "Curl_alpn_get_proxy_spec"
+  },
+  {
+   "name" : "Curl_alpn_get_spec"
+  },
+  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -203,81 +209,9 @@
    "name" : "Curl_base64url_encode"
   },
   {
-   "name" : "Curl_bufcp_free"
-  },
-  {
-   "name" : "Curl_bufcp_init"
-  },
-  {
-   "name" : "Curl_bufcp_put"
-  },
-  {
-   "name" : "Curl_bufcp_take"
-  },
-  {
    "name" : "Curl_buffer_send"
   },
   {
-   "name" : "Curl_bufq_free"
-  },
-  {
-   "name" : "Curl_bufq_init"
-  },
-  {
-   "name" : "Curl_bufq_init2"
-  },
-  {
-   "name" : "Curl_bufq_initp"
-  },
-  {
-   "name" : "Curl_bufq_is_empty"
-  },
-  {
-   "name" : "Curl_bufq_is_full"
-  },
-  {
-   "name" : "Curl_bufq_len"
-  },
-  {
-   "name" : "Curl_bufq_pass"
-  },
-  {
-   "name" : "Curl_bufq_peek"
-  },
-  {
-   "name" : "Curl_bufq_peek_at"
-  },
-  {
-   "name" : "Curl_bufq_read"
-  },
-  {
-   "name" : "Curl_bufq_reset"
-  },
-  {
-   "name" : "Curl_bufq_sipn"
-  },
-  {
-   "name" : "Curl_bufq_skip"
-  },
-  {
-   "name" : "Curl_bufq_skip_and_shift"
-  },
-  {
-   "name" : "Curl_bufq_slurp"
-  },
-  {
-   "name" : "Curl_bufq_slurpn"
-  },
-  {
-   "name" : "Curl_bufq_space"
-  },
-  {
-   "name" : "Curl_bufq_write"
-  },
-  {
-   "name" : "Curl_bufq_write_pass"
-  },
-  {
    "name" : "Curl_bufref_free"
   },
   {
@@ -347,9 +281,6 @@
    "name" : "Curl_cf_def_send"
   },
   {
-   "name" : "Curl_cf_h1_proxy_insert_after"
-  },
-  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -362,9 +293,6 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
-   "name" : "Curl_cf_http_proxy_get_host"
-  },
-  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -440,13 +368,13 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard_all"
+   "name" : "Curl_conn_cf_discard"
   },
   {
-   "name" : "Curl_conn_cf_discard_chain"
+   "name" : "Curl_conn_cf_discard_all"
   },
   {
-   "name" : "Curl_conn_cf_discard_sub"
+   "name" : "Curl_conn_cf_discard_chain"
   },
   {
    "name" : "Curl_conn_cf_get_select_socks"
@@ -458,9 +386,6 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
-   "name" : "Curl_conn_cf_is_ssl"
-  },
-  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -515,6 +440,9 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
+   "name" : "Curl_conn_http_proxy_add"
+  },
+  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -683,72 +611,6 @@
    "name" : "Curl_dyn_vprintf"
   },
   {
-   "name" : "Curl_dynhds_add"
-  },
-  {
-   "name" : "Curl_dynhds_add_custom"
-  },
-  {
-   "name" : "Curl_dynhds_cadd"
-  },
-  {
-   "name" : "Curl_dynhds_ccontains"
-  },
-  {
-   "name" : "Curl_dynhds_ccount_name"
-  },
-  {
-   "name" : "Curl_dynhds_cget"
-  },
-  {
-   "name" : "Curl_dynhds_contains"
-  },
-  {
-   "name" : "Curl_dynhds_count"
-  },
-  {
-   "name" : "Curl_dynhds_count_name"
-  },
-  {
-   "name" : "Curl_dynhds_cremove"
-  },
-  {
-   "name" : "Curl_dynhds_cset"
-  },
-  {
-   "name" : "Curl_dynhds_free"
-  },
-  {
-   "name" : "Curl_dynhds_get"
-  },
-  {
-   "name" : "Curl_dynhds_getn"
-  },
-  {
-   "name" : "Curl_dynhds_h1_add_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_cadd_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_dprint"
-  },
-  {
-   "name" : "Curl_dynhds_init"
-  },
-  {
-   "name" : "Curl_dynhds_remove"
-  },
-  {
-   "name" : "Curl_dynhds_reset"
-  },
-  {
-   "name" : "Curl_dynhds_set"
-  },
-  {
-   "name" : "Curl_dynhds_set_opts"
-  },
-  {
    "name" : "Curl_expire"
   },
   {
@@ -821,15 +683,6 @@
    "name" : "Curl_gmtime"
   },
   {
-   "name" : "Curl_h1_req_parse_free"
-  },
-  {
-   "name" : "Curl_h1_req_parse_init"
-  },
-  {
-   "name" : "Curl_h1_req_parse_read"
-  },
-  {
    "name" : "Curl_hash_add"
   },
   {
@@ -932,9 +785,6 @@
    "name" : "Curl_http_cookies"
   },
   {
-   "name" : "Curl_http_decode_status"
-  },
-  {
    "name" : "Curl_http_done"
   },
   {
@@ -962,24 +812,6 @@
    "name" : "Curl_http_readwrite_headers"
   },
   {
-   "name" : "Curl_http_req_free"
-  },
-  {
-   "name" : "Curl_http_req_make"
-  },
-  {
-   "name" : "Curl_http_req_make2"
-  },
-  {
-   "name" : "Curl_http_req_to_h2"
-  },
-  {
-   "name" : "Curl_http_resp_free"
-  },
-  {
-   "name" : "Curl_http_resp_make"
-  },
-  {
    "name" : "Curl_http_resume"
   },
   {
@@ -1655,9 +1487,6 @@
    "name" : "Curl_updatesocket"
   },
   {
-   "name" : "Curl_url_set_authority"
-  },
-  {
    "name" : "Curl_urldecode"
   },
   {
@@ -2021,9 +1850,6 @@
    "name" : "Curl_cfree"
   },
   {
-   "name" : "Curl_cft_h1_proxy"
-  },
-  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4431,10 +4257,6 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
-     "enum_field_value" : 3,
-     "name" : "CURLPROXY_HTTPS2"
-    },
-    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/arm64/source-based/libdiskconfig.so.lsdump b/34/64/arm64/source-based/libdiskconfig.so.lsdump
new file mode 100644
index 00000000..6122f786
--- /dev/null
+++ b/34/64/arm64/source-based/libdiskconfig.so.lsdump
@@ -0,0 +1,642 @@
+{
+ "array_types" :
+ [
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA0_h",
+   "name" : "unsigned char[0]",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIA0_h",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA440_h",
+   "name" : "unsigned char[440]",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIA440_h",
+   "size" : 440,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA4_12pc_partition",
+   "name" : "pc_partition[4]",
+   "referenced_type" : "_ZTI12pc_partition",
+   "self_type" : "_ZTIA4_12pc_partition",
+   "size" : 64,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "builtin_types" :
+ [
+  {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIc",
+   "name" : "char",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
+   "size" : 1
+  },
+  {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
+   "alignment" : 4,
+   "is_integral" : true,
+   "linker_set_key" : "_ZTIi",
+   "name" : "int",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
+   "size" : 4
+  },
+  {
+   "alignment" : 4,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIj",
+   "name" : "unsigned int",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
+   "size" : 4
+  },
+  {
+   "alignment" : 8,
+   "is_integral" : true,
+   "linker_set_key" : "_ZTIl",
+   "name" : "long",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIl",
+   "size" : 8
+  },
+  {
+   "alignment" : 2,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIt",
+   "name" : "unsigned short",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
+   "size" : 2
+  },
+  {
+   "linker_set_key" : "_ZTIv",
+   "name" : "void",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
+  }
+ ],
+ "elf_functions" :
+ [
+  {
+   "name" : "alloc_wl"
+  },
+  {
+   "name" : "apply_disk_config"
+  },
+  {
+   "name" : "config_mbr"
+  },
+  {
+   "name" : "dump_disk_config"
+  },
+  {
+   "name" : "find_mbr_part"
+  },
+  {
+   "name" : "find_part"
+  },
+  {
+   "name" : "find_part_device"
+  },
+  {
+   "name" : "free_wl"
+  },
+  {
+   "name" : "load_diskconfig"
+  },
+  {
+   "name" : "process_disk_config"
+  },
+  {
+   "name" : "wlist_add"
+  },
+  {
+   "name" : "wlist_commit"
+  },
+  {
+   "name" : "wlist_free"
+  },
+  {
+   "name" : "write_raw_image"
+  }
+ ],
+ "elf_objects" : [],
+ "enum_types" : [],
+ "function_types" : [],
+ "functions" :
+ [
+  {
+   "function_name" : "alloc_wl",
+   "linker_set_key" : "alloc_wl",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "apply_disk_config",
+   "linker_set_key" : "apply_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "config_mbr",
+   "linker_set_key" : "config_mbr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "dump_disk_config",
+   "linker_set_key" : "dump_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_mbr_part",
+   "linker_set_key" : "find_mbr_part",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIPc",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_part",
+   "linker_set_key" : "find_part",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIP9part_info",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_part_device",
+   "linker_set_key" : "find_part_device",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIPc",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "free_wl",
+   "linker_set_key" : "free_wl",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "load_diskconfig",
+   "linker_set_key" : "load_diskconfig",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    }
+   ],
+   "return_type" : "_ZTIP9disk_info",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "process_disk_config",
+   "linker_set_key" : "process_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_add",
+   "linker_set_key" : "wlist_add",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPP10write_list"
+    },
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_commit",
+   "linker_set_key" : "wlist_commit",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_free",
+   "linker_set_key" : "wlist_free",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "write_raw_image",
+   "linker_set_key" : "write_raw_image",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "global_vars" : [],
+ "lvalue_reference_types" : [],
+ "pointer_types" :
+ [
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIP10write_list",
+   "name" : "write_list *",
+   "referenced_type" : "_ZTI10write_list",
+   "self_type" : "_ZTIP10write_list",
+   "size" : 8,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIP9disk_info",
+   "name" : "disk_info *",
+   "referenced_type" : "_ZTI9disk_info",
+   "self_type" : "_ZTIP9disk_info",
+   "size" : 8,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIP9part_info",
+   "name" : "part_info *",
+   "referenced_type" : "_ZTI9part_info",
+   "self_type" : "_ZTIP9part_info",
+   "size" : 8,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPKc",
+   "name" : "const char *",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
+   "size" : 8,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPP10write_list",
+   "name" : "write_list **",
+   "referenced_type" : "_ZTIP10write_list",
+   "self_type" : "_ZTIPP10write_list",
+   "size" : 8,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPc",
+   "name" : "char *",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
+   "size" : 8,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "qualified_types" :
+ [
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIKc",
+   "name" : "const char",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
+   "size" : 1,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "record_types" :
+ [
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "next",
+     "referenced_type" : "_ZTIP10write_list"
+    },
+    {
+     "field_name" : "offset",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "len",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIA0_h"
+    }
+   ],
+   "linker_set_key" : "_ZTI10write_list",
+   "name" : "write_list",
+   "referenced_type" : "_ZTI10write_list",
+   "self_type" : "_ZTI10write_list",
+   "size" : 24,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "status",
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "start",
+     "field_offset" : 8,
+     "referenced_type" : "_ZTI3chs"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "end",
+     "field_offset" : 40,
+     "referenced_type" : "_ZTI3chs"
+    },
+    {
+     "field_name" : "start_lba",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "len_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI12pc_partition",
+   "name" : "pc_partition",
+   "referenced_type" : "_ZTI12pc_partition",
+   "self_type" : "_ZTI12pc_partition",
+   "size" : 16,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "code",
+     "referenced_type" : "_ZTIA440_h"
+    },
+    {
+     "field_name" : "disk_sig",
+     "field_offset" : 3520,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "pad",
+     "field_offset" : 3552,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "field_name" : "ptable",
+     "field_offset" : 3568,
+     "referenced_type" : "_ZTIA4_12pc_partition"
+    },
+    {
+     "field_name" : "mbr_sig",
+     "field_offset" : 4080,
+     "referenced_type" : "_ZTIt"
+    }
+   ],
+   "linker_set_key" : "_ZTI14pc_boot_record",
+   "name" : "pc_boot_record",
+   "referenced_type" : "_ZTI14pc_boot_record",
+   "self_type" : "_ZTI14pc_boot_record",
+   "size" : 512,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "head",
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "sector",
+     "field_offset" : 8,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "cylinder",
+     "field_offset" : 16,
+     "referenced_type" : "_ZTIh"
+    }
+   ],
+   "linker_set_key" : "_ZTI3chs",
+   "name" : "chs",
+   "referenced_type" : "_ZTI3chs",
+   "self_type" : "_ZTI3chs",
+   "size" : 3,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "device",
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "field_name" : "scheme",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "sect_size",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "skip_lba",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "num_lba",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "part_lst",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9part_info"
+    },
+    {
+     "field_name" : "num_parts",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTI9disk_info",
+   "name" : "disk_info",
+   "referenced_type" : "_ZTI9disk_info",
+   "self_type" : "_ZTI9disk_info",
+   "size" : 40,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 72,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "len_kb",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "start_lba",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI9part_info",
+   "name" : "part_info",
+   "referenced_type" : "_ZTI9part_info",
+   "self_type" : "_ZTI9part_info",
+   "size" : 24,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "rvalue_reference_types" : []
+}
diff --git a/34/64/arm64/source-based/libdmabufheap.so.lsdump b/34/64/arm64/source-based/libdmabufheap.so.lsdump
index e3f8a61b..310f6d7d 100644
--- a/34/64/arm64/source-based/libdmabufheap.so.lsdump
+++ b/34/64/arm64/source-based/libdmabufheap.so.lsdump
@@ -1555,7 +1555,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1606,7 +1606,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -7994,8 +7994,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8098,8 +8098,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8297,8 +8297,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/34/64/arm64/source-based/libdumpstateutil.so.lsdump b/34/64/arm64/source-based/libdumpstateutil.so.lsdump
index f5bea7b6..81f5b74e 100644
--- a/34/64/arm64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/arm64/source-based/libdumpstateutil.so.lsdump
@@ -153,9 +153,6 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -205,9 +202,6 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -580,12 +574,6 @@
    "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
   },
   {
-   "function_name" : "android::os::dumpstate::PropertiesHelper::IsStrictRun",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv",
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
    "function_name" : "android::os::dumpstate::PropertiesHelper::IsUserBuild",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv",
    "return_type" : "_ZTIb",
@@ -724,13 +712,6 @@
   },
   {
    "access" : "private",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E",
-   "name" : "android::os::dumpstate::PropertiesHelper::strict_run_",
-   "referenced_type" : "_ZTIi",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
-   "access" : "private",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E",
    "name" : "android::os::dumpstate::PropertiesHelper::parallel_run_",
    "referenced_type" : "_ZTIi",
diff --git a/34/64/arm64/source-based/libgralloctypes.so.lsdump b/34/64/arm64/source-based/libgralloctypes.so.lsdump
index 9d2be988..31d7c4fd 100644
--- a/34/64/arm64/source-based/libgralloctypes.so.lsdump
+++ b/34/64/arm64/source-based/libgralloctypes.so.lsdump
@@ -2861,11 +2861,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3452,11 +3452,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4037,11 +4037,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm64/source-based/libhardware.so.lsdump b/34/64/arm64/source-based/libhardware.so.lsdump
index ecb9c682..fe5e2014 100644
--- a/34/64/arm64/source-based/libhardware.so.lsdump
+++ b/34/64/arm64/source-based/libhardware.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -946,7 +946,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -967,7 +967,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -985,7 +985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -1003,7 +1003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "global_vars" : [],
@@ -1017,7 +1017,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1026,7 +1026,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1044,7 +1044,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1071,7 +1071,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1080,7 +1080,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1089,7 +1089,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1098,7 +1098,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1139,7 +1139,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1178,7 +1178,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1234,7 +1234,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1425,7 +1425,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/arm64/source-based/libhidlbase.so.lsdump b/34/64/arm64/source-based/libhidlbase.so.lsdump
index 947ba7a7..8572d96b 100644
--- a/34/64/arm64/source-based/libhidlbase.so.lsdump
+++ b/34/64/arm64/source-based/libhidlbase.so.lsdump
@@ -264,6 +264,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -276,6 +284,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -288,6 +300,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -296,11 +312,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
@@ -2350,6 +2366,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
   },
   {
@@ -2753,6 +2789,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE18__lookup_classnameIPKcEEtT_S5_bc"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__112regex_traitsIcE19__transform_primaryINS_11__wrap_iterIPcEEEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SC_c"
   },
   {
@@ -2769,6 +2809,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2833,15 +2877,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE13__lower_boundIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEERKT_SU_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEE"
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEERKT_"
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_21__tree_const_iteratorISH_PNS_11__tree_nodeISH_SE_EElEERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_21__tree_const_iteratorISH_PNS_11__tree_nodeISH_SE_EElEERKT_"
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
   },
   {
    "binding" : "weak",
@@ -2853,15 +2897,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEmmPNS_16__owns_one_stateIcEEmmb"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEmmPNS_16__owns_one_stateIcEEmmb"
   },
   {
    "binding" : "weak",
@@ -2877,10 +2925,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__parse_BACKREFIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__push_back_refEi"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ORD_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ecma_expIPKcEET_S7_S7_"
   },
   {
@@ -2897,6 +2953,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_simple_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_ERE_branchIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_awk_escapeIPKcEET_S7_S7_PNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -2909,6 +2973,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE19__parse_QUOTED_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE19__parse_atom_escapeIPKcEET_S7_S7_"
   },
   {
@@ -2929,6 +2997,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2973,10 +3045,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE25__parse_pattern_characterIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE26__parse_bracket_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2993,6 +3061,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__parse_one_char_or_coll_elem_EREIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__push_begin_marked_subexpressionEv"
   },
   {
@@ -3001,10 +3073,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE3endEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE5clearEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEE3endEv"
   },
   {
@@ -3013,6 +3097,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112regex_traitsIcE6__initEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -3021,6 +3113,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3029,10 +3125,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS_6vectorIPKcNS_9allocatorISA_EEEEEENSB_ISE_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairImPKcEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
   },
   {
@@ -3045,10 +3153,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE11__read_modeEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE4openEPKcj"
   },
   {
@@ -3101,7 +3225,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
+   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
   },
   {
    "binding" : "weak",
@@ -3117,6 +3241,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EERNS5_IS8_EEEC2EmmSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIccEERNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairImPKcEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchINS_11__wrap_iterIPKcEEEERNS_9allocatorIS6_EEEC2EmmS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchINS_11__wrap_iterIPKcEEEERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchIPKcEERNS_9allocatorIS4_EEEC2EmmS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchIPKcEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEE10push_frontEOS3_"
   },
   {
@@ -3129,6 +3285,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3137,6 +3297,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3145,11 +3309,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
@@ -3157,6 +3321,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -3253,18 +3421,70 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISN_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE14__erase_uniqueIS8_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_10unique_ptrINS_11__tree_nodeISB_PvEENS_22__tree_node_destructorINSG_ISV_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEElEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE4findIS8_EENS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE5eraseENS_21__tree_const_iteratorISB_PNS_11__tree_nodeISB_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS9_PvEENS_22__tree_node_destructorINSE_IST_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE5eraseENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSP_SP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE25__emplace_unique_key_argsIS7_JS7_SD_EEENS_4pairINS_15__tree_iteratorISE_PNS_11__tree_nodeISE_PvEElEEbEERKT_DpOT0_"
   },
   {
@@ -3281,6 +3501,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEElEEbEERKT_DpOT0_"
   },
   {
@@ -3293,6 +3517,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE14__erase_uniqueIS7_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEEbEERKT_DpOT0_"
   },
   {
@@ -3309,6 +3541,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE14__erase_uniqueIS7_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISE_EEEERSR_SR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EElEEbEERKT_DpOT0_"
   },
   {
@@ -3329,19 +3569,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE5eraseENS_21__tree_const_iteratorISD_PNS_11__tree_nodeISD_PvEElEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEElEEbEERKT_DpOT0_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEElEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
@@ -3357,6 +3597,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3369,6 +3613,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS0_IPKcNS_9allocatorIS9_EEEEEENSA_ISD_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -3377,10 +3625,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIccEENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE6assignIPS4_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS4_NS_15iterator_traitsISB_E9referenceEEE5valueEvE4typeESB_SB_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE8__appendEm"
   },
   {
@@ -3393,10 +3661,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE6resizeEm"
   },
   {
@@ -3413,6 +3689,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE6assignEmRKS4_"
   },
   {
@@ -3421,6 +3701,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE6resizeEmRKS4_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEmRKS4_"
   },
   {
@@ -3429,10 +3713,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE21__push_back_slow_pathIS1_EEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE21__push_back_slow_pathIRKcEEvOT_"
   },
   {
@@ -3441,6 +3737,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2INS_21__tree_const_iteratorIiPNS_11__tree_nodeIiPvEElEEEET_NS_9enable_ifIXaasr21__is_forward_iteratorISB_EE5valuesr16is_constructibleIiNS_15iterator_traitsISB_E9referenceEEE5valueESB_E4typeE"
   },
   {
@@ -3449,6 +3753,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3457,6 +3765,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__1plIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_12basic_stringIT_T0_T1_EERKS9_SB_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__1rsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_istreamIT_T0_EES9_RNS_12basic_stringIS6_S7_T1_EE"
   },
   {
@@ -3733,6 +4045,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -3764,6 +4080,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -3849,6 +4169,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -3996,6 +4320,10 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
+  },
+  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4005,6 +4333,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4014,6 +4346,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4040,6 +4376,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8424,6 +8764,42 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::base::V1_0::IBase>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl4base4V1_05IBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl4base4V1_05IBaseEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_215IServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_",
    "parameters" :
@@ -8472,6 +8848,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_",
    "parameters" :
@@ -8521,6 +8913,22 @@
   },
   {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE",
    "parameters" :
    [
@@ -8553,35 +8961,35 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "function_name" : "android::sp<android::hardware::hidl_binder_death_recipient>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     },
     {
-     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
     },
     {
-     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -19019,6 +19427,91 @@
   },
   {
    "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
    "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
    "parameters" :
    [
@@ -21388,8 +21881,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm64_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm64_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.UpsideDownCake_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.UpsideDownCake_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -22739,7 +23232,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm64_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.UpsideDownCake_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/34/64/arm64/source-based/libmedia_helper.so.lsdump b/34/64/arm64/source-based/libmedia_helper.so.lsdump
index 06911e7a..20c5bb96 100644
--- a/34/64/arm64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/arm64/source-based/libmedia_helper.so.lsdump
@@ -668,33 +668,21 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10valueHacOnE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
-   "name" : "_ZN7android14AudioParameter11valueHacOffE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
-   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -716,15 +704,6 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -734,9 +713,6 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
-   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1450,24 +1426,12 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10keyTtyModeE",
-   "name" : "android::AudioParameter::keyTtyMode",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter10valueFalseE",
    "name" : "android::AudioParameter::valueFalse",
    "referenced_type" : "_ZTIKPKc",
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10valueHacOnE",
-   "name" : "android::AudioParameter::valueHacOn",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter11keyChannelsE",
    "name" : "android::AudioParameter::keyChannels",
    "referenced_type" : "_ZTIKPKc",
@@ -1480,12 +1444,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter11valueHacOffE",
-   "name" : "android::AudioParameter::valueHacOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter12keyProgramIdE",
    "name" : "android::AudioParameter::keyProgramId",
    "referenced_type" : "_ZTIKPKc",
@@ -1498,12 +1456,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter13keyHacSettingE",
-   "name" : "android::AudioParameter::keyHacSetting",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter13keyMonoOutputE",
    "name" : "android::AudioParameter::keyMonoOutput",
    "referenced_type" : "_ZTIKPKc",
@@ -1546,24 +1498,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeHcoE",
-   "name" : "android::AudioParameter::valueTtyModeHco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeOffE",
-   "name" : "android::AudioParameter::valueTtyModeOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeVcoE",
-   "name" : "android::AudioParameter::valueTtyModeVco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter16keyBtLeSuspendedE",
    "name" : "android::AudioParameter::keyBtLeSuspended",
    "referenced_type" : "_ZTIKPKc",
@@ -1582,12 +1516,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter16valueTtyModeFullE",
-   "name" : "android::AudioParameter::valueTtyModeFull",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter17keyPresentationIdE",
    "name" : "android::AudioParameter::keyPresentationId",
    "referenced_type" : "_ZTIKPKc",
diff --git a/34/64/arm64/source-based/libmedia_omx.so.lsdump b/34/64/arm64/source-based/libmedia_omx.so.lsdump
index 1c45e0c7..ef009cce 100644
--- a/34/64/arm64/source-based/libmedia_omx.so.lsdump
+++ b/34/64/arm64/source-based/libmedia_omx.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5549,7 +5549,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5565,11 +5565,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5578,7 +5578,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5921,7 +5921,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5937,71 +5937,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -7273,10 +7273,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7387,14 +7383,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -10606,11 +10594,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11197,11 +11185,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11782,11 +11770,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12745,7 +12733,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12763,7 +12751,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12796,7 +12784,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12811,7 +12799,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12829,7 +12817,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12847,7 +12835,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12874,7 +12862,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12919,7 +12907,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12937,7 +12925,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12958,7 +12946,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12982,7 +12970,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13018,7 +13006,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13057,7 +13045,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13093,7 +13081,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13132,7 +13120,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13165,7 +13153,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13183,7 +13171,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13219,7 +13207,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13240,7 +13228,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17011,7 +16999,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17020,7 +17008,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17047,7 +17035,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17074,7 +17062,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17101,7 +17089,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17119,7 +17107,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17236,7 +17224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17245,7 +17233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17254,7 +17242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17263,7 +17251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17272,7 +17260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17281,7 +17269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17290,7 +17278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17308,7 +17296,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17317,7 +17305,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17326,7 +17314,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17335,7 +17323,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17344,7 +17332,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17353,7 +17341,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17362,7 +17350,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17371,7 +17359,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17380,7 +17368,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17389,7 +17377,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17407,7 +17395,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17416,7 +17404,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17443,7 +17431,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17461,7 +17449,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -18887,15 +18875,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "_ZTIN7android12LightRefBaseINS_5FenceEEE",
-   "self_type" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android12NativeHandleE",
    "name" : "android::NativeHandle *",
    "referenced_type" : "_ZTIN7android12NativeHandleE",
@@ -19004,15 +18983,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "_ZTIN7android19FenceToFenceTimeMapE",
-   "self_type" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "size" : 8,
-   "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -20359,7 +20329,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -20386,7 +20356,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -20575,7 +20545,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20605,7 +20575,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22380,13 +22350,11 @@
    "source_file" : "frameworks/av/media/libmedia/include/media/MediaCodecBuffer.h"
   },
   {
-   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
    "name" : "const std::shared_ptr<android::FenceTime>",
    "referenced_type" : "_ZTINSt3__110shared_ptrIN7android9FenceTimeEEE",
    "self_type" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
-   "size" : 16,
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -23204,7 +23172,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23260,7 +23228,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23445,7 +23413,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23589,7 +23557,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23882,7 +23850,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24264,7 +24232,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -35383,12 +35351,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -43499,15 +43461,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTION7android2spINS_7ALooperEEE",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ALooperEEE",
diff --git a/34/64/arm64/source-based/libprocessgroup.so.lsdump b/34/64/arm64/source-based/libprocessgroup.so.lsdump
index a35a76ae..d20cd471 100644
--- a/34/64/arm64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/arm64/source-based/libprocessgroup.so.lsdump
@@ -146,12 +146,6 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
-   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
-  },
-  {
-   "name" : "_Z24sendSignalToProcessGroupjii"
-  },
-  {
    "name" : "_Z24setProcessGroupSoftLimitjil"
   },
   {
@@ -250,7 +244,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1138,15 +1132,9 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1162,15 +1150,9 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1183,18 +1165,12 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1222,42 +1198,21 @@
    "name" : "_ZNK16ProfileAttribute14GetPathForTaskEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZNK16ProfileAttribute17GetPathForProcessEjiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
-   "name" : "_ZNK16ProfileAttribute9file_nameEv"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction13ExecuteForUIDEj"
   },
   {
    "name" : "_ZNK18SetAttributeAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18SetAttributeAction14IsValidForTaskEi"
-  },
-  {
-   "name" : "_ZNK18SetAttributeAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18SetAttributeAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK19SetTimerSlackAction14ExecuteForTaskEi"
   },
   {
diff --git a/34/64/arm64/source-based/libsqlite.so.lsdump b/34/64/arm64/source-based/libsqlite.so.lsdump
index 4282a1df..4e718747 100644
--- a/34/64/arm64/source-based/libsqlite.so.lsdump
+++ b/34/64/arm64/source-based/libsqlite.so.lsdump
@@ -337,9 +337,6 @@
    "name" : "sqlite3_interrupt"
   },
   {
-   "name" : "sqlite3_is_interrupted"
-  },
-  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -694,9 +691,6 @@
    "name" : "sqlite3_value_dup"
   },
   {
-   "name" : "sqlite3_value_encoding"
-  },
-  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/arm64/source-based/libssl.so.lsdump b/34/64/arm64/source-based/libssl.so.lsdump
index 3bc332eb..1f3b99b4 100644
--- a/34/64/arm64/source-based/libssl.so.lsdump
+++ b/34/64/arm64/source-based/libssl.so.lsdump
@@ -20,15 +20,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA13_22SignatureAlgorithmName",
-   "name" : "SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1424_h",
    "name" : "unsigned char[1424]",
@@ -74,15 +65,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA24_13ssl_cipher_st",
-   "name" : "ssl_cipher_st[24]",
-   "referenced_type" : "_ZTI13ssl_cipher_st",
-   "self_type" : "_ZTIA24_13ssl_cipher_st",
-   "size" : 960,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA24_h",
    "name" : "unsigned char[24]",
@@ -137,15 +119,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA3_PKc",
-   "name" : "const char *[3]",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIA3_PKc",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "linker_set_key" : "_ZTIA3_t",
    "name" : "unsigned short[3]",
@@ -192,11 +165,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -227,24 +200,6 @@
    "source_file" : "external/boringssl/src/include/openssl/sha.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl10NamedGroupE",
-   "name" : "bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIN4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA6_N4bssl11VersionInfoE",
-   "name" : "bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "size" : 96,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA7776_h",
    "name" : "unsigned char[7776]",
@@ -576,9 +531,6 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
-   "name" : "SSL_CIPHER_get_handshake_digest"
-  },
-  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -603,6 +555,9 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
+   "name" : "SSL_CIPHER_get_value"
+  },
+  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -867,9 +822,6 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
-   "name" : "SSL_CTX_set1_group_ids"
-  },
-  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1431,24 +1383,6 @@
    "name" : "SSL_get_SSL_CTX"
   },
   {
-   "name" : "SSL_get_all_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_curve_names"
-  },
-  {
-   "name" : "SSL_get_all_group_names"
-  },
-  {
-   "name" : "SSL_get_all_signature_algorithm_names"
-  },
-  {
-   "name" : "SSL_get_all_standard_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_version_names"
-  },
-  {
    "name" : "SSL_get_certificate"
   },
   {
@@ -1509,12 +1443,6 @@
    "name" : "SSL_get_finished"
   },
   {
-   "name" : "SSL_get_group_id"
-  },
-  {
-   "name" : "SSL_get_group_name"
-  },
-  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1536,9 +1464,6 @@
    "name" : "SSL_get_mode"
   },
   {
-   "name" : "SSL_get_negotiated_group"
-  },
-  {
    "name" : "SSL_get_options"
   },
   {
@@ -1809,9 +1734,6 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
-   "name" : "SSL_set1_group_ids"
-  },
-  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2190,9 +2112,6 @@
    "name" : "_ZN4bssl24ssl_cert_check_key_usageEPK6cbs_stNS_15ssl_key_usage_tE"
   },
   {
-   "name" : "_ZN4bssl24ssl_cipher_is_deprecatedEPK13ssl_cipher_st"
-  },
-  {
    "name" : "_ZN4bssl28ssl_is_valid_ech_public_nameENS_4SpanIKhEE"
   },
   {
@@ -6800,18 +6719,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CIPHER_get_handshake_digest",
-   "linker_set_key" : "SSL_CIPHER_get_handshake_digest",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK13ssl_cipher_st"
-    }
-   ],
-   "return_type" : "_ZTIPK9env_md_st",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CIPHER_get_id",
    "linker_set_key" : "SSL_CIPHER_get_id",
    "parameters" :
@@ -6908,6 +6815,18 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CIPHER_get_value",
+   "linker_set_key" : "SSL_CIPHER_get_value",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK13ssl_cipher_st"
+    }
+   ],
+   "return_type" : "_ZTIt",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CIPHER_get_version",
    "linker_set_key" : "SSL_CIPHER_get_version",
    "parameters" :
@@ -8066,24 +7985,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CTX_set1_group_ids",
-   "linker_set_key" : "SSL_CTX_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP10ssl_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CTX_set1_groups",
    "linker_set_key" : "SSL_CTX_set1_groups",
    "parameters" :
@@ -10919,96 +10820,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_all_cipher_names",
-   "linker_set_key" : "SSL_get_all_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_curve_names",
-   "linker_set_key" : "SSL_get_all_curve_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_group_names",
-   "linker_set_key" : "SSL_get_all_group_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_signature_algorithm_names",
-   "linker_set_key" : "SSL_get_all_signature_algorithm_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_standard_cipher_names",
-   "linker_set_key" : "SSL_get_all_standard_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_version_names",
-   "linker_set_key" : "SSL_get_all_version_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_certificate",
    "linker_set_key" : "SSL_get_certificate",
    "parameters" :
@@ -11276,30 +11087,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_group_id",
-   "linker_set_key" : "SSL_get_group_id",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIt",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_group_name",
-   "linker_set_key" : "SSL_get_group_name",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIt"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_info_callback",
    "linker_set_key" : "SSL_get_info_callback",
    "parameters" :
@@ -11393,18 +11180,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_negotiated_group",
-   "linker_set_key" : "SSL_get_negotiated_group",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_options",
    "linker_set_key" : "SSL_get_options",
    "parameters" :
@@ -12662,24 +12437,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_set1_group_ids",
-   "linker_set_key" : "SSL_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP6ssl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_set1_groups",
    "linker_set_key" : "SSL_set1_groups",
    "parameters" :
@@ -14506,15 +14263,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName (&)[13]",
-   "referenced_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "self_type" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA16_Kh",
    "name" : "const unsigned char (&)[16]",
    "referenced_type" : "_ZTIA16_Kh",
@@ -14542,15 +14290,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st (&)[24]",
-   "referenced_type" : "_ZTIA24_K13ssl_cipher_st",
-   "self_type" : "_ZTIRA24_K13ssl_cipher_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA2_Kh",
    "name" : "const unsigned char (&)[2]",
    "referenced_type" : "_ZTIA2_Kh",
@@ -14596,15 +14335,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA3_KPKc",
-   "name" : "const char *const (&)[3]",
-   "referenced_type" : "_ZTIA3_KPKc",
-   "self_type" : "_ZTIRA3_KPKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA3_Kt",
    "name" : "const unsigned short (&)[3]",
    "referenced_type" : "_ZTIA3_Kt",
@@ -14614,15 +14344,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA3_PKc",
-   "name" : "const char *(&)[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIRA3_PKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA4_Kh",
    "name" : "const unsigned char (&)[4]",
    "referenced_type" : "_ZTIA4_Kh",
@@ -14641,24 +14362,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA8_Kh",
    "name" : "const unsigned char (&)[8]",
    "referenced_type" : "_ZTIA8_Kh",
@@ -14686,24 +14389,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK13ssl_cipher_st",
-   "name" : "const ssl_cipher_st &",
-   "referenced_type" : "_ZTIK13ssl_cipher_st",
-   "self_type" : "_ZTIRK13ssl_cipher_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName &",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIRK22SignatureAlgorithmName",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRK6cbs_st",
    "name" : "const cbs_st &",
    "referenced_type" : "_ZTIK6cbs_st",
@@ -14713,33 +14398,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup &",
-   "referenced_type" : "_ZTIKN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRKN4bssl10NamedGroupE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo &",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRKN4bssl11VersionInfoE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> &",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> &",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -14893,15 +14551,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKPKc",
-   "name" : "const char *const &",
-   "referenced_type" : "_ZTIKPKc",
-   "self_type" : "_ZTIRKPKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKh",
    "name" : "const unsigned char &",
    "referenced_type" : "_ZTIKh",
@@ -14992,15 +14641,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRPKc",
-   "name" : "const char *&",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIRPKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRh",
    "name" : "unsigned char &",
    "referenced_type" : "_ZTIh",
@@ -15121,6 +14761,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIP11rsa_meth_st",
+   "name" : "rsa_meth_st *",
+   "referenced_type" : "_ZTI11rsa_meth_st",
+   "self_type" : "_ZTIP11rsa_meth_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIP11ssl_comp_st",
    "name" : "ssl_comp_st *",
    "referenced_type" : "_ZTI11ssl_comp_st",
@@ -15364,6 +15013,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
    "name" : "bn_mont_ctx_st *",
    "referenced_type" : "_ZTI14bn_mont_ctx_st",
@@ -18586,15 +18244,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName *",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIPK22SignatureAlgorithmName",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK22ssl_early_callback_ctx",
    "name" : "const ssl_early_callback_ctx *",
    "referenced_type" : "_ZTIK22ssl_early_callback_ctx",
@@ -18838,15 +18487,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo *",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIPKN4bssl11VersionInfoE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIK13ssl_cipher_stEE",
    "name" : "const bssl::Span<const ssl_cipher_st> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIK13ssl_cipher_stEE",
@@ -18856,15 +18496,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -18874,24 +18505,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKbEE",
@@ -18937,15 +18550,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -19522,15 +19126,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -19540,24 +19135,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKbEE",
    "name" : "bssl::Span<const bool> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -19603,15 +19180,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN4bssl4SpanIhEE",
    "name" : "bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -19774,6 +19342,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPP14ssl_session_st",
    "name" : "ssl_session_st **",
    "referenced_type" : "_ZTIP14ssl_session_st",
@@ -19806,7 +19383,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 8,
@@ -19842,7 +19419,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -19921,16 +19498,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA16_Kh",
@@ -19961,16 +19528,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st[24]",
-   "referenced_type" : "_ZTIA24_13ssl_cipher_st",
-   "self_type" : "_ZTIA24_K13ssl_cipher_st",
-   "size" : 960,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA2_Kh",
@@ -20011,16 +19568,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA3_KPKc",
-   "name" : "const char *const[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIA3_KPKc",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "_ZTIA3_Kt",
@@ -20051,26 +19598,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "size" : 96,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA8_Kh",
@@ -20371,7 +19898,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20697,16 +20224,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIK22SignatureAlgorithmName",
-   "size" : 26,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK22ssl_early_callback_ctx",
@@ -20879,11 +20396,13 @@
    "source_file" : "external/boringssl/src/include/openssl/bytestring.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 240,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -20935,17 +20454,7 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 72,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIKN4bssl11VersionInfoE",
-   "size" : 16,
+   "size" : 32,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20961,16 +20470,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName>",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup>",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -20981,26 +20480,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool>",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -21051,16 +20530,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *>",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char>",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -21105,7 +20574,7 @@
    "name" : "const bssl::internal::StackAllocated<evp_aead_ctx_st, void, &EVP_AEAD_CTX_zero, &EVP_AEAD_CTX_cleanup>",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIKN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22894,7 +22363,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22902,7 +22371,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22930,22 +22399,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5056,
+     "field_offset" : 5184,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5632,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22953,7 +22422,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23719,7 +23188,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -23731,7 +23200,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -24058,6 +23527,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 416,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 448,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 672,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 1152,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 1216,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 1280,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 1344,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 1408,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 1472,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 1600,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 1664,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 1728,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1792,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1856,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 240,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 40,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPm"
     },
@@ -24466,41 +24178,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPK22SignatureAlgorithmName"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE"
     }
    ],
@@ -24536,76 +24213,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKN4bssl11VersionInfoE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKbEE"
     }
    ],
@@ -24781,41 +24388,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIPKc"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKhEE"
     }
    ],
@@ -26501,7 +26073,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26524,7 +26096,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26789,20 +26361,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::internal::SpanBase<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE",
    "name" : "bssl::internal::SpanBase<const bssl::NamedGroup>",
    "record_kind" : "class",
@@ -26817,34 +26375,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "name" : "bssl::internal::SpanBase<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "name" : "bssl::internal::SpanBase<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKbEE",
    "name" : "bssl::internal::SpanBase<const bool>",
    "record_kind" : "class",
diff --git a/34/64/arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 9ba88821..b532121a 100644
--- a/34/64/arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -5436,7 +5436,7 @@
    "name" : "const android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIKN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -5466,7 +5466,7 @@
    "name" : "const android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIKN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6729,19 +6729,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 320,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 384,
-     "referenced_type" : "_ZTIKm"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6832,19 +6826,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 320,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 384,
-     "referenced_type" : "_ZTIKm"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9107,7 +9095,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9126,7 +9114,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index b5768aad..bf8481be 100644
--- a/34/64/arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -1002,9 +1002,6 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
-   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjm"
   },
   {
@@ -8110,10 +8107,6 @@
     },
     {
      "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
-    },
-    {
-     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -8466,10 +8459,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -8580,14 +8569,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -11716,11 +11697,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12307,11 +12288,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12892,11 +12873,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14489,37 +14470,6 @@
   },
   {
    "function_name" : "android::GraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android19GraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_16ComponentWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::GraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjm",
    "parameters" :
    [
diff --git a/34/64/arm64/source-based/libstagefright_foundation.so.lsdump b/34/64/arm64/source-based/libstagefright_foundation.so.lsdump
index 7209f9c4..e6f43808 100644
--- a/34/64/arm64/source-based/libstagefright_foundation.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_foundation.so.lsdump
@@ -24073,7 +24073,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm64_armv8-a_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm64_armv8-a_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -24115,13 +24115,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm64_armv8-a_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm64_armv8-a_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm64_armv8-a_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm64_armv8-a_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/34/64/arm64/source-based/libstagefright_omx.so.lsdump b/34/64/arm64/source-based/libstagefright_omx.so.lsdump
index 49d9c5d4..97d4fc51 100644
--- a/34/64/arm64/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_omx.so.lsdump
@@ -211,8 +211,8 @@
    "is_of_unknown_bound" : true,
    "linker_set_key" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE[]",
-   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -651,9 +651,6 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
-   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjm"
   },
   {
@@ -8770,10 +8767,6 @@
     },
     {
      "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
-    },
-    {
-     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -9126,10 +9119,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -9240,14 +9229,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -14022,7 +14003,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14043,7 +14024,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjP20OMX_BUFFERHEADERTYPEE",
@@ -14061,7 +14042,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14088,7 +14069,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14115,7 +14096,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14247,7 +14228,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjjP20OMX_BUFFERHEADERTYPEE",
@@ -15728,37 +15709,6 @@
   },
   {
    "function_name" : "android::OmxGraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android22OmxGraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_15IOmxNodeWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::OmxGraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjm",
    "parameters" :
    [
@@ -20422,8 +20372,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP16OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20476,8 +20426,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -21079,8 +21029,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android15OMXNodeInstanceE",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -21943,8 +21893,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -22987,8 +22937,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -23167,8 +23117,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -23553,8 +23503,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android15OMXNodeInstanceE",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24586,8 +24536,8 @@
    ],
    "linker_set_key" : "_ZTI12OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24787,8 +24737,8 @@
    ],
    "linker_set_key" : "_ZTI16OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 24,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -25050,8 +25000,8 @@
    ],
    "linker_set_key" : "_ZTI17OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 160,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -25484,8 +25434,8 @@
    ],
    "linker_set_key" : "_ZTI20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 80,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27757,8 +27707,8 @@
    ],
    "linker_set_key" : "_ZTI25OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27943,8 +27893,8 @@
    ],
    "linker_set_key" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 12,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29266,8 +29216,8 @@
    ],
    "linker_set_key" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 180,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29554,8 +29504,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -29742,8 +29692,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -29982,7 +29932,7 @@
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -29997,8 +29947,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 96,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -30196,8 +30146,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h"
   },
@@ -30554,8 +30504,8 @@
    ],
    "linker_set_key" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32177,8 +32127,8 @@
    ],
    "linker_set_key" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h"
   },
@@ -32279,8 +32229,8 @@
    ],
    "linker_set_key" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -32927,15 +32877,15 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "other",
@@ -32946,8 +32896,8 @@
    "linker_set_key" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE::(unnamed)",
    "record_kind" : "union",
-   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -33535,13 +33485,13 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
     "_ZTIj"
    ]
   },
@@ -33581,13 +33531,13 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase>>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
-    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
     "_ZTIN7android2wpINS_4hidl4base4V1_05IBaseEEE"
    ]
   },
@@ -33673,14 +33623,14 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
     "_ZTIj",
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ]
   },
   {
@@ -34671,13 +34621,13 @@
    "linker_set_key" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/SortedVector.h",
    "template_args" :
    [
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ],
    "vtable_components" :
    [
@@ -35715,7 +35665,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 576,
-     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35805,13 +35755,13 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 2368,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 2688,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35907,13 +35857,13 @@
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 4480,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 4800,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35924,8 +35874,8 @@
    ],
    "linker_set_key" : "_ZTIN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "vtable_components" :
@@ -43347,7 +43297,7 @@
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 832,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "protected",
@@ -43358,8 +43308,8 @@
    ],
    "linker_set_key" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 176,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "vtable_components" :
@@ -45392,15 +45342,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTION7android2spINS_7ABufferEEE",
    "name" : "android::sp<android::ABuffer> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ABufferEEE",
diff --git a/34/64/arm64/source-based/libstagefright_omx_utils.so.lsdump b/34/64/arm64/source-based/libstagefright_omx_utils.so.lsdump
index 499d23f0..3f6b1053 100644
--- a/34/64/arm64/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_omx_utils.so.lsdump
@@ -7259,10 +7259,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7373,14 +7369,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -9854,11 +9842,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24605,12 +24593,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
diff --git a/34/64/arm64/source-based/libtinyalsa.so.lsdump b/34/64/arm64/source-based/libtinyalsa.so.lsdump
index aecfca35..a6276783 100644
--- a/34/64/arm64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/arm64/source-based/libtinyalsa.so.lsdump
@@ -219,9 +219,6 @@
    "name" : "pcm_get_subdevice"
   },
   {
-   "name" : "pcm_get_xruns"
-  },
-  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1302,18 +1299,6 @@
    "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
   },
   {
-   "function_name" : "pcm_get_xruns",
-   "linker_set_key" : "pcm_get_xruns",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP3pcm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
-  },
-  {
    "function_name" : "pcm_ioctl",
    "linker_set_key" : "pcm_ioctl",
    "parameters" :
diff --git a/34/64/arm64/source-based/libui.so.lsdump b/34/64/arm64/source-based/libui.so.lsdump
index 13f1356f..2ed33199 100644
--- a/34/64/arm64/source-based/libui.so.lsdump
+++ b/34/64/arm64/source-based/libui.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -860,6 +860,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -868,10 +872,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1202,10 +1214,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1445,6 +1453,34 @@
    "name" : "_ZNK7android14Gralloc4Mapper17getAllocationSizeEPK13native_handlePm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINS_8hardware8graphics6common4V1_211PixelFormatEEEiRKNS3_6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS9_8hidl_vecIhEEPT_ESS_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS8_20StandardMetadataTypeEPFiRKNSD_8hidl_vecIhEEPT_ESR_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIjEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperImEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper18validateBufferSizeEPK13native_handlejjijmj"
   },
   {
@@ -1472,6 +1508,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1488,6 +1528,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1507,6 +1551,10 @@
    "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalIN4aidl7android8hardware8graphics6common9Smpte2086EEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSO_PNSE_8hidl_vecIhEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSM_PNSC_8hidl_vecIhEEE"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper4lockEPK13native_handlemRKNS_4RectEiP13android_ycbcr"
   },
   {
@@ -2295,6 +2343,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE14__erase_uniqueIS4_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE25__emplace_unique_key_argsIS4_JRKNS_21piecewise_construct_tENS_5tupleIJOS4_EEENSR_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeISC_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -2307,6 +2359,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6rehashEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeISC_PvEEEE"
   },
   {
@@ -2323,10 +2379,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
@@ -2339,11 +2403,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EmmS9_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvmEEES3_EERNS_9allocatorIS6_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
   },
   {
    "binding" : "weak",
@@ -2371,6 +2439,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLm128EEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2435,6 +2507,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
@@ -2447,10 +2527,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE6assignIPS6_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS6_NS_15iterator_traitsISD_E9referenceEEE5valueEvE4typeESD_SD_"
   },
   {
@@ -2459,11 +2555,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEm"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEm"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
@@ -2503,6 +2603,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE18__construct_at_endEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEEC2Em"
   },
   {
@@ -2519,6 +2627,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5eraseENS_11__wrap_iterIPKS4_EESB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLm128EEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLm128EEEE6resizeEm"
   },
   {
@@ -2535,10 +2651,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPKhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS8_E9referenceEEE5valueEvE4typeES8_S8_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEm"
   },
   {
@@ -2551,9 +2679,17 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "android_convertGralloc0To1Usage"
   },
   {
@@ -3868,7 +4004,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -3884,11 +4020,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -3897,7 +4033,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4089,7 +4225,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4105,71 +4241,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4489,7 +4625,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4497,7 +4633,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7259,7 +7395,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8241,11 +8377,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8832,11 +8968,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9417,11 +9553,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10733,7 +10869,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10751,7 +10887,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10784,7 +10920,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10799,7 +10935,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10817,7 +10953,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10835,7 +10971,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10862,7 +10998,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10907,7 +11043,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10925,7 +11061,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10946,7 +11082,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10970,7 +11106,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11006,7 +11142,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11045,7 +11181,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11081,7 +11217,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11120,7 +11256,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11153,7 +11289,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11171,7 +11307,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11207,7 +11343,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11228,7 +11364,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14374,6 +14510,19 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/PublicFormat.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::clear",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_5FenceEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::Fence>::~sp",
    "linker_set_key" : "_ZN7android2spINS_5FenceEED2Ev",
    "parameters" :
@@ -14403,6 +14552,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_",
    "parameters" :
@@ -14419,6 +14584,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V4_0::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_",
    "parameters" :
@@ -16101,12 +16282,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
@@ -22024,7 +22199,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22033,7 +22208,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22078,7 +22253,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22114,7 +22289,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22123,7 +22298,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22213,7 +22388,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22222,7 +22397,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22231,7 +22406,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22240,7 +22415,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22249,7 +22424,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22258,7 +22433,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22267,7 +22442,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22285,7 +22460,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22294,7 +22469,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22303,7 +22478,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22312,7 +22487,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22321,7 +22496,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22330,7 +22505,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22339,7 +22514,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22348,7 +22523,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22357,7 +22532,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22366,7 +22541,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22384,7 +22559,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22393,7 +22568,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22420,7 +22595,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22447,7 +22622,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -25372,7 +25547,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25512,7 +25687,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25550,7 +25725,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28097,7 +28272,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28153,7 +28328,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28317,7 +28492,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28414,7 +28589,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28573,7 +28748,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28761,7 +28936,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/arm64/source-based/libunwindstack.so.lsdump b/34/64/arm64/source-based/libunwindstack.so.lsdump
index 06998b17..b690c0a2 100644
--- a/34/64/arm64/source-based/libunwindstack.so.lsdump
+++ b/34/64/arm64/source-based/libunwindstack.so.lsdump
@@ -101,6 +101,24 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextRiscv64.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIA45_j",
+   "name" : "unsigned int[45]",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIA45_j",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA45_m",
+   "name" : "unsigned long[45]",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIA45_m",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA64_m",
    "name" : "unsigned long[64]",
@@ -218,367 +236,400 @@
  "elf_functions" :
  [
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
+   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
+   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
+   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
+   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs6_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs6_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
-   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE"
   },
   {
-   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
+   "name" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips645CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_pcEm"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_spEm"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C2Ev"
   },
   {
    "name" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE"
@@ -2469,6 +2520,45 @@
    "name" : "_ZN11unwindstack8MemoryXzD2Ev"
   },
   {
+   "name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcmEEE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips5CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_pcEm"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_spEm"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC2Ev"
+  },
+  {
    "name" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEmm"
   },
   {
@@ -3213,13 +3303,10 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
-  },
-  {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
   },
   {
    "binding" : "weak",
@@ -3284,6 +3371,9 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
+   "name" : "_ZTVN11unwindstack10RegsMips64E"
+  },
+  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3475,6 +3565,9 @@
    "name" : "_ZTVN11unwindstack8RegsImplImEE"
   },
   {
+   "name" : "_ZTVN11unwindstack8RegsMipsE"
+  },
+  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3542,9 +3635,6 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
-  },
-  {
-   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3716,6 +3806,48 @@
    "underlying_type" : "_ZTIm"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS32_EF_R0"
+    },
+    {
+     "enum_field_value" : 40,
+     "name" : "unwindstack::MIPS32_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "name" : "unwindstack::Mips32UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_EF_R0"
+    },
+    {
+     "enum_field_value" : 34,
+     "name" : "unwindstack::MIPS64_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "name" : "unwindstack::Mips64UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4046,6 +4178,163 @@
    "underlying_type" : "_ZTIt"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack7MipsRegE",
+   "name" : "unwindstack::MipsReg",
+   "referenced_type" : "_ZTIN11unwindstack7MipsRegE",
+   "self_type" : "_ZTIN11unwindstack7MipsRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4071,6 +4360,14 @@
     },
     {
      "enum_field_value" : 5,
+     "name" : "unwindstack::ARCH_MIPS"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::ARCH_MIPS64"
+    },
+    {
+     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4338,6 +4635,163 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS64_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS64_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS64_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS64_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS64_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS64_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS64_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS64_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS64_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS64_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS64_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS64_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS64_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS64_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS64_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS64_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS64_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS64_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS64_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS64_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS64_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS64_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS64_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS64_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS64_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS64_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS64_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS64_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS64_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS64_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS64_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack9Mips64RegE",
+   "name" : "unwindstack::Mips64Reg",
+   "referenced_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "self_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "unwindstack::X86_64_REG_RAX"
     },
     {
@@ -4443,6 +4897,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/Maps.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips64::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcmEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Arch",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Read",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Clone",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips645CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_pcEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_spEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
    "function_name" : "unwindstack::RegsX86_64::SetFromUcontext",
    "linker_set_key" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE",
    "parameters" :
@@ -7174,6 +7816,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsX86.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcmEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcmEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Arch",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Read",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Clone",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips5CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_pcEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_spEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "unwindstack::Unwinder::FillInFrame",
    "linker_set_key" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEmm",
@@ -8106,6 +8936,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64 *",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIPN11unwindstack10RegsMips64E",
+   "size" : 8,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64 *",
    "referenced_type" : "_ZTIN11unwindstack10RegsX86_64E",
@@ -8466,6 +9305,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips *",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIPN11unwindstack8RegsMipsE",
+   "size" : 8,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN11unwindstack8UnwinderE",
    "name" : "unwindstack::Unwinder *",
    "referenced_type" : "_ZTIN11unwindstack8UnwinderE",
@@ -8982,6 +9830,82 @@
      "referenced_type" : "_ZTIN11unwindstack8RegsImplImEE"
     }
    ],
+   "linker_set_key" : "_ZTIN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "size" : 48,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack10RegsMips64E"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips644ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplImE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_pcEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_spEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEtm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips645CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplImEE"
+    }
+   ],
    "linker_set_key" : "_ZTIN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64",
    "record_kind" : "class",
@@ -9299,6 +10223,12 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__18iteratorINS_26bidirectional_iterator_tagEPN11unwindstack8DwarfFdeElPS4_RS4_EE"
+    }
+   ],
    "fields" :
    [
     {
@@ -9705,6 +10635,32 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/SharedString.h"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_size",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack12mips_stack_tE",
+   "name" : "unwindstack::mips_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "self_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "size" : 12,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
@@ -10051,6 +11007,48 @@
      "referenced_type" : "_ZTIm"
     },
     {
+     "field_name" : "ss_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "name" : "unwindstack::mips64_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "self_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "size" : 24,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_j"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips_user_regsE",
+   "name" : "unwindstack::mips_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "self_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIm"
+    },
+    {
      "field_name" : "ss_flags",
      "field_offset" : 64,
      "referenced_type" : "_ZTIi"
@@ -10444,6 +11442,68 @@
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sc_regmask",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_status",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_regs",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIA32_m"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "name" : "unwindstack::mips_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "size" : 272,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "name" : "unwindstack::mips_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "size" : 296,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -10846,6 +11906,22 @@
    "fields" :
    [
     {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_m"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "name" : "unwindstack::mips64_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "self_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIm"
     }
@@ -11008,6 +12084,103 @@
    "fields" :
    [
     {
+     "field_name" : "sc_regs",
+     "referenced_type" : "_ZTIA32_m"
+    },
+    {
+     "field_name" : "sc_fpregs",
+     "field_offset" : 2048,
+     "referenced_type" : "_ZTIA32_m"
+    },
+    {
+     "field_name" : "sc_mdhi",
+     "field_offset" : 4096,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_hi1",
+     "field_offset" : 4160,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_hi2",
+     "field_offset" : 4224,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_hi3",
+     "field_offset" : 4288,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_mdlo",
+     "field_offset" : 4352,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_lo1",
+     "field_offset" : 4416,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_lo2",
+     "field_offset" : 4480,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_lo3",
+     "field_offset" : 4544,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 4608,
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "name" : "unwindstack::mips64_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "size" : 584,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "name" : "unwindstack::mips64_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "size" : 624,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "regs",
      "referenced_type" : "_ZTIA32_m"
     }
@@ -12591,6 +13764,82 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplIjEE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "size" : 48,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack8RegsMipsE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips4ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplIjE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_pcEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_spEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEtm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcmEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips5CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
diff --git a/34/64/arm64/source-based/libutils.so.lsdump b/34/64/arm64/source-based/libutils.so.lsdump
index 5069926f..5ec9e098 100644
--- a/34/64/arm64/source-based/libutils.so.lsdump
+++ b/34/64/arm64/source-based/libutils.so.lsdump
@@ -493,6 +493,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -738,6 +742,9 @@
    "name" : "_ZN7android7String813appendFormatVEPKcSt9__va_list"
   },
   {
+   "name" : "_ZN7android7String816convertToResPathEv"
+  },
+  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1216,6 +1223,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIimEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEmRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIimEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKmEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1236,10 +1247,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIimEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueImEEmRKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE17__deallocate_nodeEPNS_16__hash_node_baseIPNS_11__hash_nodeIS5_PvEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsImJRKmRS4_EEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS5_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1263,6 +1282,10 @@
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE8__rehashEm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
    "name" : "_ZTv0_n24_N7android14LooperCallbackD0Ev"
   },
   {
@@ -5733,6 +5756,19 @@
    "source_file" : "system/core/libutils/include/utils/misc.h"
   },
   {
+   "function_name" : "android::sp<android::LooperCallback>::clear",
+   "linker_set_key" : "_ZN7android2spINS_14LooperCallbackEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14LooperCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::SimpleLooperCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_",
    "parameters" :
@@ -7008,6 +7044,19 @@
    "source_file" : "system/core/libutils/include/utils/String8.h"
   },
   {
+   "function_name" : "android::String8::convertToResPath",
+   "linker_set_key" : "_ZN7android7String816convertToResPathEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android7String8E"
+    }
+   ],
+   "return_type" : "_ZTIRN7android7String8E",
+   "source_file" : "system/core/libutils/include/utils/String8.h"
+  },
+  {
    "function_name" : "android::String8::clear",
    "linker_set_key" : "_ZN7android7String85clearEv",
    "parameters" :
diff --git a/34/64/arm64/source-based/libxml2.so.lsdump b/34/64/arm64/source-based/libxml2.so.lsdump
index 94c9f6ce..8f9e75c7 100644
--- a/34/64/arm64/source-based/libxml2.so.lsdump
+++ b/34/64/arm64/source-based/libxml2.so.lsdump
@@ -719,9 +719,6 @@
    "name" : "xmlCtxtResetPush"
   },
   {
-   "name" : "xmlCtxtSetMaxAmplification"
-  },
-  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1406,9 +1403,6 @@
    "name" : "xmlMemShow"
   },
   {
-   "name" : "xmlMemSize"
-  },
-  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1922,9 +1916,6 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
-   "name" : "xmlParserInputBufferCreateString"
-  },
-  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3011,9 +3002,6 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
-   "name" : "xmlTextReaderSetMaxAmplification"
-  },
-  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5402,43 +5390,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "XML_ENC_ERR_SUCCESS"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "XML_ENC_ERR_SPACE"
-    },
-    {
-     "enum_field_value" : -2,
-     "name" : "XML_ENC_ERR_INPUT"
-    },
-    {
-     "enum_field_value" : -3,
-     "name" : "XML_ENC_ERR_PARTIAL"
-    },
-    {
-     "enum_field_value" : -4,
-     "name" : "XML_ENC_ERR_INTERNAL"
-    },
-    {
-     "enum_field_value" : -5,
-     "name" : "XML_ENC_ERR_MEMORY"
-    }
-   ],
-   "linker_set_key" : "_ZTI15xmlCharEncError",
-   "name" : "xmlCharEncError",
-   "referenced_type" : "_ZTI15xmlCharEncError",
-   "self_type" : "_ZTI15xmlCharEncError",
-   "size" : 4,
-   "source_file" : "external/libxml2/include/libxml/encoding.h",
-   "underlying_type" : "_ZTIi"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : -1,
      "name" : "XML_CHAR_ENCODING_ERROR"
     },
@@ -6021,10 +5972,6 @@
      "name" : "XML_ERR_COMMENT_ABRUPTLY_ENDED"
     },
     {
-     "enum_field_value" : 113,
-     "name" : "XML_WAR_ENCODING_MISMATCH"
-    },
-    {
      "enum_field_value" : 200,
      "name" : "XML_NS_ERR_XML_NAMESPACE"
     },
@@ -9544,10 +9491,6 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -14028,21 +13971,6 @@
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
-   "function_name" : "xmlCtxtSetMaxAmplification",
-   "linker_set_key" : "xmlCtxtSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlParserCtxt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/parser.h"
-  },
-  {
    "function_name" : "xmlCtxtUseOptions",
    "linker_set_key" : "xmlCtxtUseOptions",
    "parameters" :
@@ -17292,18 +17220,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
   },
   {
-   "function_name" : "xmlMemSize",
-   "linker_set_key" : "xmlMemSize",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
-  },
-  {
    "function_name" : "xmlMemStrdupLoc",
    "linker_set_key" : "xmlMemStrdupLoc",
    "parameters" :
@@ -19827,18 +19743,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlIO.h"
   },
   {
-   "function_name" : "xmlParserInputBufferCreateString",
-   "linker_set_key" : "xmlParserInputBufferCreateString",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    }
-   ],
-   "return_type" : "_ZTIP21_xmlParserInputBuffer",
-   "source_file" : "external/libxml2/include/private/io.h"
-  },
-  {
    "function_name" : "xmlParserInputBufferGrow",
    "linker_set_key" : "xmlParserInputBufferGrow",
    "parameters" :
@@ -22715,7 +22619,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25503,21 +25407,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlreader.h"
   },
   {
-   "function_name" : "xmlTextReaderSetMaxAmplification",
-   "linker_set_key" : "xmlTextReaderSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlTextReader"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/xmlreader.h"
-  },
-  {
    "function_name" : "xmlTextReaderSetParserProp",
    "linker_set_key" : "xmlTextReaderSetParserProp",
    "parameters" :
@@ -35401,18 +35290,13 @@
      "field_name" : "nbWarnings",
      "field_offset" : 6064,
      "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "maxAmpl",
-     "field_offset" : 6080,
-     "referenced_type" : "_ZTIj"
     }
    ],
    "linker_set_key" : "_ZTI14_xmlParserCtxt",
    "name" : "_xmlParserCtxt",
    "referenced_type" : "_ZTI14_xmlParserCtxt",
    "self_type" : "_ZTI14_xmlParserCtxt",
-   "size" : 768,
+   "size" : 760,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -36096,7 +35980,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "flags",
+     "field_name" : "standalone",
      "field_offset" : 768,
      "referenced_type" : "_ZTIi"
     },
diff --git a/34/64/arm64/source-based/libyuv.so.lsdump b/34/64/arm64/source-based/libyuv.so.lsdump
index 5393e7d2..c73c65f8 100644
--- a/34/64/arm64/source-based/libyuv.so.lsdump
+++ b/34/64/arm64/source-based/libyuv.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -140,30 +140,12 @@
    "name" : "ABGRToI420"
   },
   {
-   "name" : "ABGRToJ400"
-  },
-  {
-   "name" : "ABGRToJ420"
-  },
-  {
-   "name" : "ABGRToJ422"
-  },
-  {
    "name" : "ABGRToNV12"
   },
   {
    "name" : "ABGRToNV21"
   },
   {
-   "name" : "ABGRToUVJRow_Any_NEON"
-  },
-  {
-   "name" : "ABGRToUVJRow_C"
-  },
-  {
-   "name" : "ABGRToUVJRow_NEON"
-  },
-  {
    "name" : "ABGRToUVRow_Any_NEON"
   },
   {
@@ -173,15 +155,6 @@
    "name" : "ABGRToUVRow_NEON"
   },
   {
-   "name" : "ABGRToYJRow_Any_NEON"
-  },
-  {
-   "name" : "ABGRToYJRow_C"
-  },
-  {
-   "name" : "ABGRToYJRow_NEON"
-  },
-  {
    "name" : "ABGRToYRow_Any_NEON"
   },
   {
@@ -581,9 +554,6 @@
    "name" : "ARGBToI420"
   },
   {
-   "name" : "ARGBToI420Alpha"
-  },
-  {
    "name" : "ARGBToI422"
   },
   {
@@ -890,18 +860,6 @@
    "name" : "DetilePlane"
   },
   {
-   "name" : "DetilePlane_16"
-  },
-  {
-   "name" : "DetileRow_16_Any_NEON"
-  },
-  {
-   "name" : "DetileRow_16_C"
-  },
-  {
-   "name" : "DetileRow_16_NEON"
-  },
-  {
    "name" : "DetileRow_Any_NEON"
   },
   {
@@ -923,18 +881,6 @@
    "name" : "DetileSplitUVRow_NEON"
   },
   {
-   "name" : "DetileToYUY2"
-  },
-  {
-   "name" : "DetileToYUY2_Any_NEON"
-  },
-  {
-   "name" : "DetileToYUY2_C"
-  },
-  {
-   "name" : "DetileToYUY2_NEON"
-  },
-  {
    "name" : "DivideRow_16_Any_NEON"
   },
   {
@@ -1085,9 +1031,6 @@
    "name" : "I010Copy"
   },
   {
-   "name" : "I010Rotate"
-  },
-  {
    "name" : "I010ToAB30"
   },
   {
@@ -1145,9 +1088,6 @@
    "name" : "I210Copy"
   },
   {
-   "name" : "I210Rotate"
-  },
-  {
    "name" : "I210ToAB30"
   },
   {
@@ -1199,9 +1139,6 @@
    "name" : "I212ToARGBRow_C"
   },
   {
-   "name" : "I212ToI420"
-  },
-  {
    "name" : "I212ToI422"
   },
   {
@@ -1244,12 +1181,6 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
-   "name" : "I410Copy"
-  },
-  {
-   "name" : "I410Rotate"
-  },
-  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1265,15 +1196,9 @@
    "name" : "I410ToI010"
   },
   {
-   "name" : "I410ToI420"
-  },
-  {
    "name" : "I410ToI444"
   },
   {
-   "name" : "I412ToI420"
-  },
-  {
    "name" : "I412ToI444"
   },
   {
@@ -1382,9 +1307,6 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
-   "name" : "I420ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1499,18 +1421,6 @@
    "name" : "I422ToNV21"
   },
   {
-   "name" : "I422ToRAW"
-  },
-  {
-   "name" : "I422ToRGB24"
-  },
-  {
-   "name" : "I422ToRGB24Matrix"
-  },
-  {
-   "name" : "I422ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I422ToRGB24Row_Any_NEON"
   },
   {
@@ -1523,9 +1433,6 @@
    "name" : "I422ToRGB565"
   },
   {
-   "name" : "I422ToRGB565Matrix"
-  },
-  {
    "name" : "I422ToRGB565Row_Any_NEON"
   },
   {
@@ -1634,24 +1541,6 @@
    "name" : "I444ToNV21"
   },
   {
-   "name" : "I444ToRAW"
-  },
-  {
-   "name" : "I444ToRGB24"
-  },
-  {
-   "name" : "I444ToRGB24Matrix"
-  },
-  {
-   "name" : "I444ToRGB24Row_Any_NEON"
-  },
-  {
-   "name" : "I444ToRGB24Row_C"
-  },
-  {
-   "name" : "I444ToRGB24Row_NEON"
-  },
-  {
    "name" : "InitCpuFlags"
   },
   {
@@ -1748,12 +1637,6 @@
    "name" : "MM21ToNV12"
   },
   {
-   "name" : "MM21ToYUY2"
-  },
-  {
-   "name" : "MT2TToP010"
-  },
-  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -1784,6 +1667,12 @@
    "name" : "MergeARGBPlane"
   },
   {
+   "name" : "MergeARGBPlaneAlpha"
+  },
+  {
+   "name" : "MergeARGBPlaneOpaque"
+  },
+  {
    "name" : "MergeARGBRow_Any_NEON"
   },
   {
@@ -1877,9 +1766,6 @@
    "name" : "MirrorPlane"
   },
   {
-   "name" : "MirrorRow_16_C"
-  },
-  {
    "name" : "MirrorRow_Any_NEON"
   },
   {
@@ -2057,15 +1943,9 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
-   "name" : "P010ToI010"
-  },
-  {
    "name" : "P010ToP410"
   },
   {
-   "name" : "P012ToI012"
-  },
-  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2336,9 +2216,6 @@
    "name" : "RGBToYMatrixRow_NEON"
   },
   {
-   "name" : "RiscvCpuCaps"
-  },
-  {
    "name" : "RotatePlane"
   },
   {
@@ -2351,9 +2228,6 @@
    "name" : "RotatePlane90"
   },
   {
-   "name" : "RotatePlane_16"
-  },
-  {
    "name" : "Scale"
   },
   {
@@ -2498,9 +2372,6 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
-   "name" : "ScalePlaneDown2_16To8"
-  },
-  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2534,12 +2405,6 @@
    "name" : "ScalePlane_16"
   },
   {
-   "name" : "ScaleRowDown2Box_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Box_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2561,12 +2426,6 @@
    "name" : "ScaleRowDown2Box_Odd_NEON"
   },
   {
-   "name" : "ScaleRowDown2Linear_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2579,12 +2438,6 @@
    "name" : "ScaleRowDown2Linear_NEON"
   },
   {
-   "name" : "ScaleRowDown2_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -2810,24 +2663,12 @@
    "name" : "ScaleUVRowDown2Box_NEON"
   },
   {
-   "name" : "ScaleUVRowDown2Linear_Any_NEON"
-  },
-  {
    "name" : "ScaleUVRowDown2Linear_C"
   },
   {
-   "name" : "ScaleUVRowDown2Linear_NEON"
-  },
-  {
-   "name" : "ScaleUVRowDown2_Any_NEON"
-  },
-  {
    "name" : "ScaleUVRowDown2_C"
   },
   {
-   "name" : "ScaleUVRowDown2_NEON"
-  },
-  {
    "name" : "ScaleUVRowDownEvenBox_C"
   },
   {
@@ -2942,6 +2783,12 @@
    "name" : "SplitARGBPlane"
   },
   {
+   "name" : "SplitARGBPlaneAlpha"
+  },
+  {
+   "name" : "SplitARGBPlaneOpaque"
+  },
+  {
    "name" : "SplitARGBRow_Any_NEON"
   },
   {
@@ -3032,21 +2879,9 @@
    "name" : "SwapUVRow_NEON"
   },
   {
-   "name" : "Transpose4x4_32_C"
-  },
-  {
-   "name" : "Transpose4x4_32_NEON"
-  },
-  {
    "name" : "TransposePlane"
   },
   {
-   "name" : "TransposePlane_16"
-  },
-  {
-   "name" : "TransposeUVWx8_16_C"
-  },
-  {
    "name" : "TransposeUVWx8_Any_NEON"
   },
   {
@@ -3059,9 +2894,6 @@
    "name" : "TransposeUVWxH_C"
   },
   {
-   "name" : "TransposeWx8_16_C"
-  },
-  {
    "name" : "TransposeWx8_Any_NEON"
   },
   {
@@ -3071,9 +2903,6 @@
    "name" : "TransposeWx8_NEON"
   },
   {
-   "name" : "TransposeWxH_16_C"
-  },
-  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3176,12 +3005,6 @@
    "name" : "UYVYToYRow_NEON"
   },
   {
-   "name" : "UnpackMT2T_C"
-  },
-  {
-   "name" : "UnpackMT2T_NEON"
-  },
-  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3209,15 +3032,6 @@
    "name" : "YUY2ToNV12"
   },
   {
-   "name" : "YUY2ToNVUVRow_Any_NEON"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_C"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_NEON"
-  },
-  {
    "name" : "YUY2ToUV422Row_Any_NEON"
   },
   {
@@ -3441,7 +3255,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3482,7 +3296,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3515,7 +3329,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3828,7 +3642,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4077,7 +3891,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4105,7 +3919,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4129,7 +3943,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4159,7 +3973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_NEON",
@@ -4177,7 +3991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4195,7 +4009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_NEON",
@@ -4213,7 +4027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4240,7 +4054,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4258,7 +4072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4285,7 +4099,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4324,112 +4138,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ400",
-   "linker_set_key" : "ABGRToJ400",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ420",
-   "linker_set_key" : "ABGRToJ420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ422",
-   "linker_set_key" : "ABGRToJ422",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4462,7 +4171,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4495,79 +4204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_Any_NEON",
-   "linker_set_key" : "ABGRToUVJRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_C",
-   "linker_set_key" : "ABGRToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_NEON",
-   "linker_set_key" : "ABGRToUVJRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_NEON",
@@ -4591,7 +4228,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -4615,7 +4252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_NEON",
@@ -4639,61 +4276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_Any_NEON",
-   "linker_set_key" : "ABGRToYJRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_C",
-   "linker_set_key" : "ABGRToYJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_NEON",
-   "linker_set_key" : "ABGRToYJRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_NEON",
@@ -4711,7 +4294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -4729,7 +4312,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_NEON",
@@ -4747,7 +4330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -4774,7 +4357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -4792,7 +4375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -4819,7 +4402,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -4837,7 +4420,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -4864,7 +4447,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -4882,7 +4465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -4912,7 +4495,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -4933,7 +4516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -4960,7 +4543,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -4987,7 +4570,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_NEON",
@@ -5005,7 +4588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -5023,7 +4606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_NEON",
@@ -5041,7 +4624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -5068,7 +4651,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_NEON",
@@ -5086,7 +4669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -5104,7 +4687,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_NEON",
@@ -5122,7 +4705,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -5161,7 +4744,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_Any_NEON",
@@ -5185,7 +4768,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -5209,7 +4792,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_NEON",
@@ -5233,7 +4816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_Any_NEON",
@@ -5251,7 +4834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -5269,7 +4852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_NEON",
@@ -5287,7 +4870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -5314,7 +4897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_NEON",
@@ -5332,7 +4915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -5350,7 +4933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_NEON",
@@ -5368,7 +4951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -5407,7 +4990,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_Any_NEON",
@@ -5431,7 +5014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5455,7 +5038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_NEON",
@@ -5479,7 +5062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_Any_NEON",
@@ -5497,7 +5080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5515,7 +5098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_NEON",
@@ -5533,7 +5116,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5566,7 +5149,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_NEON",
@@ -5587,7 +5170,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5608,7 +5191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_NEON",
@@ -5629,7 +5212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5653,7 +5236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -5680,7 +5263,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_NEON",
@@ -5698,7 +5281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -5716,7 +5299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_NEON",
@@ -5734,7 +5317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -5767,7 +5350,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -5788,7 +5371,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_NEON",
@@ -5809,7 +5392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -5845,7 +5428,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -5875,7 +5458,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -5896,7 +5479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_NEON",
@@ -5917,7 +5500,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -5947,7 +5530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -5965,7 +5548,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -5992,7 +5575,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6019,7 +5602,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6046,7 +5629,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -6064,7 +5647,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -6091,7 +5674,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -6109,7 +5692,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -6130,7 +5713,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -6157,7 +5740,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_NEON",
@@ -6175,7 +5758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -6193,7 +5776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_NEON",
@@ -6211,7 +5794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -6238,7 +5821,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -6256,7 +5839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_NEON",
@@ -6274,7 +5857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -6301,7 +5884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -6337,7 +5920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -6367,7 +5950,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -6391,7 +5974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -6418,7 +6001,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_NEON",
@@ -6436,7 +6019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -6454,7 +6037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_NEON",
@@ -6472,7 +6055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -6505,7 +6088,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_NEON",
@@ -6526,7 +6109,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -6547,7 +6130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_NEON",
@@ -6568,7 +6151,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -6598,7 +6181,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -6619,7 +6202,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -6655,7 +6238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -6679,7 +6262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_NEON",
@@ -6703,7 +6286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -6733,37 +6316,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBRotate",
-   "linker_set_key" : "ARGBRotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -6790,7 +6343,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -6805,7 +6358,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_NEON",
@@ -6820,7 +6373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_Any_NEON",
@@ -6838,7 +6391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -6856,7 +6409,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_NEON",
@@ -6874,7 +6427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -6904,7 +6457,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -6925,7 +6478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_NEON",
@@ -6946,7 +6499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -6976,7 +6529,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_NEON",
@@ -6997,7 +6550,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -7018,7 +6571,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_NEON",
@@ -7039,7 +6592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -7066,7 +6619,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -7093,7 +6646,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -7120,7 +6673,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -7153,7 +6706,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_NEON",
@@ -7174,7 +6727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -7195,7 +6748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_NEON",
@@ -7216,7 +6769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -7243,7 +6796,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_NEON",
@@ -7261,7 +6814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -7279,7 +6832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_NEON",
@@ -7297,34 +6850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToABGR",
-   "linker_set_key" : "ARGBToABGR",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -7351,7 +6877,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -7369,7 +6895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -7396,7 +6922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_NEON",
@@ -7414,7 +6940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -7432,7 +6958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_NEON",
@@ -7450,7 +6976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -7477,7 +7003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_NEON",
@@ -7495,7 +7021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -7513,7 +7039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_NEON",
@@ -7531,7 +7057,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -7558,7 +7084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_NEON",
@@ -7576,7 +7102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -7594,7 +7120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_NEON",
@@ -7612,34 +7138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToBGRA",
-   "linker_set_key" : "ARGBToBGRA",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -7666,7 +7165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -7705,52 +7204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToI420Alpha",
-   "linker_set_key" : "ARGBToI420Alpha",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -7789,7 +7243,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -7828,7 +7282,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -7855,7 +7309,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -7894,7 +7348,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -7933,7 +7387,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -7966,7 +7420,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -7999,7 +7453,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -8026,7 +7480,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_NEON",
@@ -8044,7 +7498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -8062,7 +7516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_NEON",
@@ -8080,7 +7534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -8107,7 +7561,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_NEON",
@@ -8125,7 +7579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -8143,7 +7597,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_NEON",
@@ -8161,7 +7615,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -8188,7 +7642,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -8218,7 +7672,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_NEON",
@@ -8239,7 +7693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -8253,14 +7707,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_NEON",
@@ -8274,14 +7728,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_NEON",
@@ -8299,7 +7753,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -8317,7 +7771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_NEON",
@@ -8335,7 +7789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -8362,7 +7816,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_NEON",
@@ -8383,7 +7837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -8404,7 +7858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_NEON",
@@ -8425,7 +7879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_NEON",
@@ -8449,7 +7903,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -8473,7 +7927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_NEON",
@@ -8497,7 +7951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_NEON",
@@ -8521,7 +7975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -8545,7 +7999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_NEON",
@@ -8569,7 +8023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -8596,7 +8050,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_NEON",
@@ -8614,7 +8068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -8632,7 +8086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_NEON",
@@ -8650,7 +8104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_NEON",
@@ -8668,7 +8122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -8686,7 +8140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_NEON",
@@ -8704,7 +8158,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -8731,7 +8185,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -8758,7 +8212,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -8776,7 +8230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -8809,7 +8263,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -8842,7 +8296,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_Any_NEON",
@@ -8863,7 +8317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -8884,7 +8338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_NEON",
@@ -8905,7 +8359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_Any_NEON",
@@ -8926,7 +8380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -8947,7 +8401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_NEON",
@@ -8968,7 +8422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_Any_NEON",
@@ -8986,7 +8440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -9004,7 +8458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_NEON",
@@ -9022,7 +8476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -9064,7 +8518,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -9106,7 +8560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -9151,7 +8605,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -9205,7 +8659,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -9262,7 +8716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -9274,7 +8728,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -9301,7 +8755,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -9340,7 +8794,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_NEON",
@@ -9364,7 +8818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -9388,7 +8842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_NEON",
@@ -9412,7 +8866,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_NEON",
@@ -9430,7 +8884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -9448,7 +8902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_NEON",
@@ -9466,7 +8920,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -9505,7 +8959,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -9529,7 +8983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -9550,7 +9004,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_Any_NEON",
@@ -9571,7 +9025,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -9592,7 +9046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_NEON",
@@ -9613,7 +9067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -9640,7 +9094,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -9667,7 +9121,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -9679,7 +9133,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -9700,7 +9154,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -9718,7 +9172,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -9736,7 +9190,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -9763,7 +9217,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -9793,7 +9247,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_NEON",
@@ -9814,7 +9268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -9835,7 +9289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_NEON",
@@ -9856,7 +9310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -9886,7 +9340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -9907,7 +9361,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -9949,7 +9403,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -9994,7 +9448,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -10051,7 +9505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -10081,7 +9535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -10111,7 +9565,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -10138,7 +9592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -10165,7 +9619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -10183,7 +9637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_NEON",
@@ -10201,7 +9655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -10219,7 +9673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_NEON",
@@ -10237,7 +9691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -10255,7 +9709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -10282,7 +9736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -10311,101 +9765,8 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetilePlane_16",
-   "linker_set_key" : "DetilePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_Any_NEON",
-   "linker_set_key" : "DetileRow_16_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_C",
-   "linker_set_key" : "DetileRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_NEON",
-   "linker_set_key" : "DetileRow_16_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_NEON",
@@ -10426,7 +9787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -10447,7 +9808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_NEON",
@@ -10468,7 +9829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -10504,7 +9865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_NEON",
@@ -10528,7 +9889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -10552,7 +9913,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_NEON",
@@ -10576,124 +9937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2",
-   "linker_set_key" : "DetileToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_Any_NEON",
-   "linker_set_key" : "DetileToYUY2_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_C",
-   "linker_set_key" : "DetileToYUY2_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_NEON",
-   "linker_set_key" : "DetileToYUY2_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_NEON",
@@ -10714,7 +9958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -10735,7 +9979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_NEON",
@@ -10756,7 +10000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -10771,7 +10015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -10786,37 +10030,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::GaussCol_C",
-   "linker_set_key" : "GaussCol_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -10846,7 +10060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_NEON",
@@ -10876,7 +10090,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -10903,25 +10117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::GaussRow_C",
-   "linker_set_key" : "GaussRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKj"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -10939,7 +10135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_NEON",
@@ -10957,13 +10153,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -11002,7 +10198,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -11041,7 +10237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -11080,7 +10276,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -11119,7 +10315,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -11158,7 +10354,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -11197,7 +10393,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -11236,7 +10432,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -11275,7 +10471,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -11314,7 +10510,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -11353,7 +10549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -11392,7 +10588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -11431,7 +10627,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -11470,7 +10666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -11509,7 +10705,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -11548,7 +10744,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -11587,7 +10783,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -11626,7 +10822,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -11665,7 +10861,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -11704,7 +10900,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_Any_NEON",
@@ -11725,7 +10921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_NEON",
@@ -11746,7 +10942,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -11776,7 +10972,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_NEON",
@@ -11797,7 +10993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -11818,7 +11014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_NEON",
@@ -11839,7 +11035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -11872,7 +11068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -11899,7 +11095,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_NEON",
@@ -11926,7 +11122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -11944,7 +11140,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_NEON",
@@ -11962,7 +11158,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -11980,7 +11176,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -11998,7 +11194,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -12049,7 +11245,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -12103,7 +11299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -12154,61 +11350,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I010Rotate",
-   "linker_set_key" : "I010Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -12247,7 +11389,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -12286,7 +11428,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -12325,7 +11467,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -12367,7 +11509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -12412,7 +11554,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -12451,7 +11593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -12493,7 +11635,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -12538,7 +11680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -12589,7 +11731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -12640,7 +11782,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -12685,7 +11827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -12727,7 +11869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -12769,7 +11911,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -12820,7 +11962,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -12865,7 +12007,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -12916,7 +12058,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -12970,7 +12112,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -13000,7 +12142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -13051,61 +12193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I210Rotate",
-   "linker_set_key" : "I210Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -13144,7 +12232,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -13183,7 +12271,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -13222,7 +12310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -13264,7 +12352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -13309,7 +12397,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -13336,7 +12424,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -13375,7 +12463,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -13417,7 +12505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -13462,7 +12550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -13489,7 +12577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -13540,7 +12628,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -13591,7 +12679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -13642,7 +12730,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -13693,7 +12781,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -13738,7 +12826,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -13765,7 +12853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -13792,58 +12880,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I212ToI420",
-   "linker_set_key" : "I212ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -13894,7 +12931,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -13939,7 +12976,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -13966,7 +13003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -13993,7 +13030,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -14020,7 +13057,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -14050,7 +13087,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_NEON",
@@ -14071,7 +13108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -14092,7 +13129,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_NEON",
@@ -14113,7 +13150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -14140,7 +13177,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -14179,7 +13216,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -14212,7 +13249,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -14263,7 +13300,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -14293,112 +13330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I410Copy",
-   "linker_set_key" : "I410Copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I410Rotate",
-   "linker_set_key" : "I410Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -14440,7 +13372,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -14467,7 +13399,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -14509,7 +13441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -14536,7 +13468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -14587,58 +13519,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I410ToI420",
-   "linker_set_key" : "I410ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -14689,58 +13570,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I412ToI420",
-   "linker_set_key" : "I412ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -14791,7 +13621,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -14839,7 +13669,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -14887,7 +13717,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -14938,7 +13768,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -14992,7 +13822,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -15067,7 +13897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -15118,7 +13948,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -15190,7 +14020,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -15241,7 +14071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -15292,7 +14122,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -15340,7 +14170,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -15394,7 +14224,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -15454,7 +14284,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -15514,7 +14344,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -15574,7 +14404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -15625,7 +14455,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -15664,7 +14494,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -15703,7 +14533,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -15742,7 +14572,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -15784,7 +14614,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -15823,7 +14653,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -15862,7 +14692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -15901,7 +14731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -15943,7 +14773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -15988,7 +14818,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -16027,7 +14857,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -16078,7 +14908,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -16129,7 +14959,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -16168,7 +14998,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -16219,7 +15049,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -16270,7 +15100,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -16315,7 +15145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -16360,7 +15190,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -16399,7 +15229,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -16438,7 +15268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -16480,52 +15310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I420ToRGB24MatrixFilter",
-   "linker_set_key" : "I420ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -16564,7 +15349,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -16606,7 +15391,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -16648,7 +15433,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -16687,7 +15472,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -16729,7 +15514,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -16768,7 +15553,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -16807,7 +15592,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -16855,7 +15640,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -16903,7 +15688,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -16954,7 +15739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -17008,7 +15793,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_NEON",
@@ -17038,7 +15823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -17068,7 +15853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_NEON",
@@ -17098,7 +15883,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -17149,7 +15934,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -17203,7 +15988,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -17263,7 +16048,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -17323,7 +16108,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -17383,7 +16168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -17422,7 +16207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -17449,7 +16234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -17488,7 +16273,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_NEON",
@@ -17515,7 +16300,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -17542,7 +16327,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_NEON",
@@ -17569,7 +16354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_NEON",
@@ -17596,7 +16381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -17623,7 +16408,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_NEON",
@@ -17650,7 +16435,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -17692,7 +16477,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -17737,7 +16522,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_NEON",
@@ -17764,7 +16549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -17791,7 +16576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_NEON",
@@ -17818,7 +16603,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -17857,7 +16642,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -17908,7 +16693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -17959,7 +16744,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -18010,7 +16795,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -18055,172 +16840,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRAW",
-   "linker_set_key" : "I422ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24",
-   "linker_set_key" : "I422ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24Matrix",
-   "linker_set_key" : "I422ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24MatrixFilter",
-   "linker_set_key" : "I422ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_NEON",
@@ -18247,7 +16867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -18274,7 +16894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_NEON",
@@ -18301,7 +16921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -18340,49 +16960,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB565Matrix",
-   "linker_set_key" : "I422ToRGB565Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_NEON",
@@ -18409,7 +16987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -18436,7 +17014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_NEON",
@@ -18463,7 +17041,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -18502,7 +17080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -18544,7 +17122,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_NEON",
@@ -18571,7 +17149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -18598,7 +17176,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_NEON",
@@ -18625,7 +17203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -18664,7 +17242,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_NEON",
@@ -18688,7 +17266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -18712,7 +17290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_NEON",
@@ -18736,7 +17314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -18775,7 +17353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_NEON",
@@ -18799,7 +17377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -18823,7 +17401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_NEON",
@@ -18847,7 +17425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -18895,7 +17473,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -18943,7 +17521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -18994,7 +17572,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_NEON",
@@ -19024,7 +17602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -19054,7 +17632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_NEON",
@@ -19084,7 +17662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -19135,7 +17713,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -19189,7 +17767,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -19249,7 +17827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -19309,7 +17887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -19369,7 +17947,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -19408,7 +17986,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -19447,7 +18025,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -19489,7 +18067,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_NEON",
@@ -19516,7 +18094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -19543,7 +18121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_NEON",
@@ -19570,7 +18148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -19621,7 +18199,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -19666,7 +18244,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -19711,214 +18289,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRAW",
-   "linker_set_key" : "I444ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24",
-   "linker_set_key" : "I444ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Matrix",
-   "linker_set_key" : "I444ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_Any_NEON",
-   "linker_set_key" : "I444ToRGB24Row_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_C",
-   "linker_set_key" : "I444ToRGB24Row_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_NEON",
-   "linker_set_key" : "I444ToRGB24Row_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -19954,7 +18331,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -19990,7 +18367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_NEON",
@@ -20017,7 +18394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -20044,7 +18421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_NEON",
@@ -20071,7 +18448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_Any_NEON",
@@ -20095,7 +18472,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -20119,7 +18496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_NEON",
@@ -20143,7 +18520,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_NEON",
@@ -20167,7 +18544,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -20191,7 +18568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_NEON",
@@ -20215,7 +18592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -20242,7 +18619,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_NEON",
@@ -20260,7 +18637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -20278,7 +18655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_NEON",
@@ -20296,7 +18673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -20335,7 +18712,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -20374,7 +18751,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -20413,7 +18790,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -20452,7 +18829,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -20491,7 +18868,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -20530,7 +18907,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -20569,7 +18946,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -20608,7 +18985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -20647,7 +19024,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -20668,7 +19045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -20701,7 +19078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -20746,7 +19123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -20785,7 +19162,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -20824,7 +19201,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -20869,7 +19246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -20908,79 +19285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MM21ToYUY2",
-   "linker_set_key" : "MM21ToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MT2TToP010",
-   "linker_set_key" : "MT2TToP010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -20992,7 +19297,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -21040,7 +19345,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_NEON",
@@ -21070,7 +19375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -21100,7 +19405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_NEON",
@@ -21130,7 +19435,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -21178,7 +19483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_NEON",
@@ -21208,7 +19513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -21238,7 +19543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_NEON",
@@ -21268,7 +19573,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -21313,7 +19618,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_NEON",
@@ -21340,7 +19645,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -21367,7 +19672,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_NEON",
@@ -21394,7 +19699,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -21433,7 +19738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -21457,7 +19762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_NEON",
@@ -21481,7 +19786,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -21514,7 +19819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -21550,7 +19855,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_NEON",
@@ -21574,7 +19879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -21598,7 +19903,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_NEON",
@@ -21622,7 +19927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_NEON",
@@ -21643,7 +19948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -21664,7 +19969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_NEON",
@@ -21685,7 +19990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -21727,7 +20032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_Any_NEON",
@@ -21754,7 +20059,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_NEON",
@@ -21781,7 +20086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_NEON",
@@ -21808,7 +20113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -21835,7 +20140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_NEON",
@@ -21862,7 +20167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_NEON",
@@ -21889,7 +20194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -21916,7 +20221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_NEON",
@@ -21943,7 +20248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_NEON",
@@ -21970,7 +20275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -21997,7 +20302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_NEON",
@@ -22024,7 +20329,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_NEON",
@@ -22048,7 +20353,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -22072,7 +20377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_NEON",
@@ -22096,7 +20401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -22108,7 +20413,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -22135,25 +20440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::MirrorRow_16_C",
-   "linker_set_key" : "MirrorRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_NEON",
@@ -22171,7 +20458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -22189,7 +20476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_NEON",
@@ -22207,7 +20494,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -22228,7 +20515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_NEON",
@@ -22249,7 +20536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -22276,7 +20563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_NEON",
@@ -22294,7 +20581,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -22312,7 +20599,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_NEON",
@@ -22330,7 +20617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_NEON",
@@ -22351,7 +20638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -22372,7 +20659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_NEON",
@@ -22393,7 +20680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -22432,7 +20719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -22471,7 +20758,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -22519,7 +20806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -22552,7 +20839,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -22585,7 +20872,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -22621,7 +20908,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_NEON",
@@ -22645,7 +20932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -22669,7 +20956,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_NEON",
@@ -22693,7 +20980,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -22738,7 +21025,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -22786,7 +21073,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -22825,7 +21112,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -22858,7 +21145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -22891,7 +21178,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -22927,7 +21214,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_NEON",
@@ -22951,7 +21238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -22975,7 +21262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_NEON",
@@ -22999,7 +21286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -23032,7 +21319,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -23068,7 +21355,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_NEON",
@@ -23092,7 +21379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -23116,7 +21403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_NEON",
@@ -23140,7 +21427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -23179,7 +21466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -23218,7 +21505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -23251,7 +21538,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -23284,7 +21571,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -23320,7 +21607,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_NEON",
@@ -23344,7 +21631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -23368,7 +21655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_NEON",
@@ -23392,7 +21679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -23437,7 +21724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -23476,7 +21763,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -23509,7 +21796,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -23542,7 +21829,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -23578,7 +21865,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_NEON",
@@ -23602,7 +21889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -23626,7 +21913,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_NEON",
@@ -23650,7 +21937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -23683,7 +21970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_NEON",
@@ -23704,7 +21991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -23725,7 +22012,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_NEON",
@@ -23746,7 +22033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -23782,7 +22069,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -23821,7 +22108,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -23857,7 +22144,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -23896,52 +22183,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::P010ToI010",
-   "linker_set_key" : "P010ToI010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -23980,52 +22222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::P012ToI012",
-   "linker_set_key" : "P012ToI012",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -24061,7 +22258,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -24100,7 +22297,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -24124,7 +22321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -24160,7 +22357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -24199,7 +22396,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -24223,7 +22420,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -24262,7 +22459,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -24286,7 +22483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -24310,7 +22507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -24337,7 +22534,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_NEON",
@@ -24355,7 +22552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -24373,7 +22570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_NEON",
@@ -24391,7 +22588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -24430,7 +22627,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -24457,7 +22654,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -24496,7 +22693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -24529,7 +22726,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -24556,7 +22753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_NEON",
@@ -24574,7 +22771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -24592,7 +22789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_NEON",
@@ -24610,7 +22807,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -24637,7 +22834,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_NEON",
@@ -24655,7 +22852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -24673,7 +22870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_NEON",
@@ -24691,7 +22888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_Any_NEON",
@@ -24715,7 +22912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -24739,7 +22936,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_NEON",
@@ -24763,7 +22960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_Any_NEON",
@@ -24787,7 +22984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -24811,7 +23008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_NEON",
@@ -24835,7 +23032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_NEON",
@@ -24853,7 +23050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -24871,7 +23068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_NEON",
@@ -24889,7 +23086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_Any_NEON",
@@ -24907,7 +23104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -24925,7 +23122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_NEON",
@@ -24943,7 +23140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -24970,7 +23167,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_NEON",
@@ -24988,7 +23185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -25006,7 +23203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_NEON",
@@ -25024,7 +23221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -25051,7 +23248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_NEON",
@@ -25069,7 +23266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -25087,7 +23284,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_NEON",
@@ -25105,7 +23302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -25144,7 +23341,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -25171,7 +23368,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -25210,7 +23407,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_Any_NEON",
@@ -25234,7 +23431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -25258,7 +23455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_NEON",
@@ -25282,7 +23479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_Any_NEON",
@@ -25306,7 +23503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -25330,7 +23527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_NEON",
@@ -25354,7 +23551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_NEON",
@@ -25372,7 +23569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -25390,7 +23587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_NEON",
@@ -25408,7 +23605,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_Any_NEON",
@@ -25426,7 +23623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -25444,7 +23641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_NEON",
@@ -25462,7 +23659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -25489,7 +23686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_NEON",
@@ -25507,7 +23704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -25525,7 +23722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_NEON",
@@ -25543,7 +23740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -25582,7 +23779,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_Any_NEON",
@@ -25606,7 +23803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -25630,7 +23827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_NEON",
@@ -25654,7 +23851,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_Any_NEON",
@@ -25672,7 +23869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -25690,7 +23887,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_NEON",
@@ -25708,7 +23905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -25735,7 +23932,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -25774,7 +23971,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -25801,31 +23998,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::RGBAToUVJRow_C",
-   "linker_set_key" : "RGBAToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_NEON",
@@ -25849,7 +24022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -25873,7 +24046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_NEON",
@@ -25897,7 +24070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_NEON",
@@ -25915,7 +24088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -25933,7 +24106,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_NEON",
@@ -25951,7 +24124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_NEON",
@@ -25969,7 +24142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -25987,7 +24160,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_NEON",
@@ -26005,7 +24178,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -26035,7 +24208,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -26065,7 +24238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -26083,7 +24256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -26119,19 +24292,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_rgb.h"
-  },
-  {
-   "function_name" : "libyuv::RiscvCpuCaps",
-   "linker_set_key" : "RiscvCpuCaps",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -26161,7 +24322,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -26188,7 +24349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -26215,7 +24376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -26242,37 +24403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
-  },
-  {
-   "function_name" : "libyuv::RotatePlane_16",
-   "linker_set_key" : "RotatePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -26332,7 +24463,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -26356,7 +24487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -26380,7 +24511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_Any_NEON",
@@ -26404,7 +24535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -26428,7 +24559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_NEON",
@@ -26452,7 +24583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -26476,7 +24607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_Any_NEON",
@@ -26500,7 +24631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -26524,7 +24655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_NEON",
@@ -26548,7 +24679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_NEON",
@@ -26569,7 +24700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -26590,7 +24721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_NEON",
@@ -26611,7 +24742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_NEON",
@@ -26632,7 +24763,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -26653,7 +24784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_NEON",
@@ -26674,7 +24805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_NEON",
@@ -26695,7 +24826,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -26716,7 +24847,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_NEON",
@@ -26737,7 +24868,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_NEON",
@@ -26761,7 +24892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -26785,7 +24916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_NEON",
@@ -26809,7 +24940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_NEON",
@@ -26833,7 +24964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -26857,7 +24988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_NEON",
@@ -26881,7 +25012,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -26899,7 +25030,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_NEON",
@@ -26917,7 +25048,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -26935,7 +25066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_NEON",
@@ -26953,7 +25084,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -26977,7 +25108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -27001,7 +25132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -27025,7 +25156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -27049,7 +25180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -27073,7 +25204,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -27097,7 +25228,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -27121,7 +25252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_Any_NEON",
@@ -27145,7 +25276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -27169,7 +25300,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_NEON",
@@ -27193,7 +25324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -27217,7 +25348,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -27238,7 +25369,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_NEON",
@@ -27259,7 +25390,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -27295,46 +25426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScalePlaneDown2_16To8",
-   "linker_set_key" : "ScalePlaneDown2_16To8",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -27379,7 +25471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -27424,7 +25516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -27472,7 +25564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -27508,7 +25600,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -27544,55 +25636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -27613,7 +25657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_NEON",
@@ -27634,7 +25678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -27655,7 +25699,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_NEON",
@@ -27676,7 +25720,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -27697,7 +25741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_NEON",
@@ -27718,55 +25762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -27787,7 +25783,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_NEON",
@@ -27808,7 +25804,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -27829,7 +25825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_NEON",
@@ -27850,55 +25846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -27919,7 +25867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_NEON",
@@ -27940,7 +25888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -27961,7 +25909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_NEON",
@@ -27982,7 +25930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -28003,7 +25951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_NEON",
@@ -28024,7 +25972,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -28045,7 +25993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_NEON",
@@ -28066,7 +26014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -28087,7 +26035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -28108,7 +26056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_NEON",
@@ -28129,7 +26077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -28150,7 +26098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_NEON",
@@ -28171,7 +26119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_NEON",
@@ -28192,7 +26140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -28213,7 +26161,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_NEON",
@@ -28234,7 +26182,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -28255,7 +26203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -28276,7 +26224,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_NEON",
@@ -28297,7 +26245,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -28318,7 +26266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_NEON",
@@ -28339,7 +26287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -28360,7 +26308,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_NEON",
@@ -28381,7 +26329,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -28402,7 +26350,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_NEON",
@@ -28423,7 +26371,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_NEON",
@@ -28444,7 +26392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -28465,7 +26413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_NEON",
@@ -28486,7 +26434,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -28507,7 +26455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_NEON",
@@ -28528,7 +26476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -28549,7 +26497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_NEON",
@@ -28570,7 +26518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -28591,7 +26539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_NEON",
@@ -28612,7 +26560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -28633,7 +26581,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_NEON",
@@ -28654,7 +26602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_NEON",
@@ -28678,7 +26626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_NEON",
@@ -28702,7 +26650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -28726,7 +26674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_NEON",
@@ -28750,7 +26698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -28774,7 +26722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_NEON",
@@ -28798,7 +26746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -28822,7 +26770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_NEON",
@@ -28846,7 +26794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -28870,7 +26818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_NEON",
@@ -28894,7 +26842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_NEON",
@@ -28912,7 +26860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_NEON",
@@ -28930,7 +26878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -28948,7 +26896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_NEON",
@@ -28966,7 +26914,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -28984,7 +26932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_NEON",
@@ -29002,7 +26950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -29020,7 +26968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_NEON",
@@ -29038,7 +26986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -29056,7 +27004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_NEON",
@@ -29074,7 +27022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -29095,7 +27043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_NEON",
@@ -29116,7 +27064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -29152,7 +27100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -29173,7 +27121,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_NEON",
@@ -29194,7 +27142,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -29218,7 +27166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -29242,7 +27190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -29266,7 +27214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -29290,7 +27238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -29314,7 +27262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_NEON",
@@ -29335,7 +27283,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -29356,7 +27304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_NEON",
@@ -29377,28 +27325,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2Linear_Any_NEON",
-   "linker_set_key" : "ScaleUVRowDown2Linear_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -29419,49 +27346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2Linear_NEON",
-   "linker_set_key" : "ScaleUVRowDown2Linear_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2_Any_NEON",
-   "linker_set_key" : "ScaleUVRowDown2_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -29482,28 +27367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2_NEON",
-   "linker_set_key" : "ScaleUVRowDown2_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -29527,7 +27391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_Any_NEON",
@@ -29551,7 +27415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -29575,7 +27439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_NEON",
@@ -29599,7 +27463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -29623,7 +27487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_NEON",
@@ -29647,7 +27511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -29671,7 +27535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_NEON",
@@ -29695,7 +27559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -29719,7 +27583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_NEON",
@@ -29743,7 +27607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -29767,7 +27631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_NEON",
@@ -29791,7 +27655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -29809,7 +27673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_NEON",
@@ -29827,7 +27691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -29845,7 +27709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_NEON",
@@ -29863,7 +27727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -29881,7 +27745,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_NEON",
@@ -29899,7 +27763,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -29917,7 +27781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_NEON",
@@ -29935,7 +27799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -29959,7 +27823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_NEON",
@@ -29977,7 +27841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -29995,7 +27859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_NEON",
@@ -30013,7 +27877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_NEON",
@@ -30034,7 +27898,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -30055,7 +27919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_NEON",
@@ -30076,7 +27940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_NEON",
@@ -30097,7 +27961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -30118,7 +27982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_NEON",
@@ -30139,7 +28003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -30163,7 +28027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_NEON",
@@ -30187,7 +28051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_NEON",
@@ -30208,7 +28072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -30229,7 +28093,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_NEON",
@@ -30250,7 +28114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -30271,7 +28135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_NEON",
@@ -30292,7 +28156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -30337,7 +28201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_NEON",
@@ -30364,7 +28228,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -30391,7 +28255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_NEON",
@@ -30418,7 +28282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -30457,7 +28321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_NEON",
@@ -30481,7 +28345,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -30505,7 +28369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_NEON",
@@ -30529,7 +28393,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -30565,7 +28429,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -30598,7 +28462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -30631,7 +28495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -30664,7 +28528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -30697,7 +28561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -30730,7 +28594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -30766,7 +28630,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_NEON",
@@ -30790,7 +28654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -30814,7 +28678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_NEON",
@@ -30838,7 +28702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_NEON",
@@ -30859,7 +28723,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -30880,7 +28744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_NEON",
@@ -30901,7 +28765,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_NEON",
@@ -30925,7 +28789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -30949,7 +28813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_NEON",
@@ -30973,7 +28837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -30988,7 +28852,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -31006,7 +28870,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_NEON",
@@ -31024,7 +28888,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -31051,7 +28915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_NEON",
@@ -31069,7 +28933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -31087,7 +28951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_NEON",
@@ -31105,55 +28969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::Transpose4x4_32_C",
-   "linker_set_key" : "Transpose4x4_32_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::Transpose4x4_32_NEON",
-   "linker_set_key" : "Transpose4x4_32_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -31180,7 +28996,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_NEON",
@@ -31210,7 +29026,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -31240,7 +29056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_NEON",
@@ -31270,7 +29086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -31303,31 +29119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWx8_16_C",
-   "linker_set_key" : "TransposeWx8_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_NEON",
@@ -31351,7 +29143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -31375,7 +29167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_NEON",
@@ -31399,34 +29191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWxH_16_C",
-   "linker_set_key" : "TransposeWxH_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -31453,7 +29218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -31492,7 +29257,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -31531,7 +29296,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -31570,7 +29335,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -31609,7 +29374,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -31648,7 +29413,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -31687,7 +29452,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -31726,7 +29491,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -31765,7 +29530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -31804,7 +29569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -31843,7 +29608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -31882,7 +29647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -31921,7 +29686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -31960,7 +29725,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -31999,7 +29764,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -32026,7 +29791,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_NEON",
@@ -32047,7 +29812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -32068,7 +29833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_NEON",
@@ -32089,7 +29854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -32128,7 +29893,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -32167,7 +29932,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -32200,7 +29965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_NEON",
@@ -32221,7 +29986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -32242,7 +30007,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_NEON",
@@ -32263,7 +30028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_NEON",
@@ -32287,7 +30052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -32311,7 +30076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_NEON",
@@ -32335,7 +30100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -32362,7 +30127,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_NEON",
@@ -32380,7 +30145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -32398,7 +30163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_NEON",
@@ -32416,43 +30181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_C",
-   "linker_set_key" : "UnpackMT2T_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_NEON",
-   "linker_set_key" : "UnpackMT2T_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -32467,7 +30196,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -32494,7 +30223,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_NEON",
@@ -32515,7 +30244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -32536,7 +30265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_NEON",
@@ -32557,7 +30286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -32596,7 +30325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -32635,7 +30364,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -32668,70 +30397,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_Any_NEON",
-   "linker_set_key" : "YUY2ToNVUVRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_C",
-   "linker_set_key" : "YUY2ToNVUVRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_NEON",
-   "linker_set_key" : "YUY2ToNVUVRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_NEON",
@@ -32752,7 +30418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -32773,7 +30439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_NEON",
@@ -32794,7 +30460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_NEON",
@@ -32818,7 +30484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -32842,7 +30508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_NEON",
@@ -32866,7 +30532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -32893,7 +30559,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_NEON",
@@ -32911,7 +30577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -32929,7 +30595,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_NEON",
@@ -32947,7 +30613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -32961,7 +30627,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -32974,7 +30640,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32988,7 +30654,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -33001,7 +30667,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -33023,7 +30689,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -33048,7 +30714,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -33064,7 +30730,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -33077,7 +30743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -33093,7 +30759,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -33109,7 +30775,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -33126,7 +30792,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -33142,7 +30808,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -33158,7 +30824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -33174,7 +30840,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -33191,7 +30857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -33205,7 +30871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -33221,7 +30887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -33237,7 +30903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -33255,7 +30921,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -33268,7 +30934,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -33284,7 +30950,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -33297,7 +30963,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -33310,7 +30976,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -33329,7 +30995,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -33342,7 +31008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -33355,7 +31021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -33368,7 +31034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -33381,7 +31047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -33390,121 +31056,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -33517,7 +31183,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33526,7 +31192,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33535,7 +31201,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -33544,7 +31210,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33553,7 +31219,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -33562,7 +31228,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33571,7 +31237,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -33580,7 +31246,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 8,
@@ -33589,7 +31255,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -33598,7 +31264,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 8,
@@ -33607,16 +31273,7 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKj",
-   "name" : "const unsigned int *",
-   "referenced_type" : "_ZTIKj",
-   "self_type" : "_ZTIPKj",
-   "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33625,7 +31282,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -33634,7 +31291,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33643,7 +31300,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33652,7 +31309,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33661,7 +31318,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33670,7 +31327,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33679,7 +31336,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -33688,7 +31345,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -33697,7 +31354,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33706,7 +31363,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "alignment" : 8,
@@ -33715,7 +31372,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -33724,7 +31381,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -33737,7 +31394,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 16,
@@ -33747,7 +31404,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -33757,7 +31414,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -33767,7 +31424,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -33777,7 +31434,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -33787,7 +31444,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -33797,7 +31454,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -33807,7 +31464,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -33817,7 +31474,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -33827,7 +31484,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -33856,7 +31513,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 16,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -33934,7 +31591,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 96,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 16,
@@ -33955,7 +31612,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 8,
@@ -33976,7 +31633,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 16,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/arm_arm64/source-based/android.hardware.audio.common@2.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.audio.common@2.0.so.lsdump
index c37d7ee3..17915e95 100644
--- a/34/64/arm_arm64/source-based/android.hardware.audio.common@2.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.audio.common@2.0.so.lsdump
@@ -2668,7 +2668,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::NONE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::BIT_IN"
     },
     {
@@ -2808,119 +2808,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2937,7 +2937,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3085,7 +3085,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -3666,7 +3666,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -3890,39 +3890,39 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_HDR"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
index e86f49fb..f901d935 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
@@ -636,7 +636,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -644,7 +644,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
index 6d7b41ac..4e8fa1db 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
@@ -3691,11 +3691,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
index 361f894d..3f95b13b 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
@@ -3685,11 +3685,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4276,11 +4276,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4861,11 +4861,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
index 53679389..709df671 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
@@ -563,7 +563,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -571,7 +571,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump
index 57cca99b..9955685d 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.0.so.lsdump
@@ -2857,11 +2857,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump
index 60ead84b..98503a3d 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.1.so.lsdump
@@ -2857,11 +2857,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3448,11 +3448,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump
index 881e0207..1f58c7c7 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.common@1.2.so.lsdump
@@ -2874,11 +2874,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3465,11 +3465,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4050,11 +4050,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
index 55600149..827aa92e 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
@@ -3231,11 +3231,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
index b788925f..9551dac6 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
@@ -3229,11 +3229,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3820,11 +3820,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
index 7e65fbc3..66b06bbe 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
@@ -3267,11 +3267,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3858,11 +3858,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4443,11 +4443,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
index 25beb122..75a5d1e2 100644
--- a/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
@@ -3363,11 +3363,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3954,11 +3954,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4539,11 +4539,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/android.hardware.media.omx@1.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.media.omx@1.0.so.lsdump
index 470db12a..ac239e0d 100644
--- a/34/64/arm_arm64/source-based/android.hardware.media.omx@1.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.media.omx@1.0.so.lsdump
@@ -5061,11 +5061,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.media@1.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.media@1.0.so.lsdump
index d2b324c0..639b86b5 100644
--- a/34/64/arm_arm64/source-based/android.hardware.media@1.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.media@1.0.so.lsdump
@@ -2865,11 +2865,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/arm_arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index 8ea6dc92..0a44f9ce 100644
--- a/34/64/arm_arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
@@ -3419,7 +3419,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::NONE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::BIT_IN"
     },
     {
@@ -3559,119 +3559,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3688,7 +3688,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3836,7 +3836,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -4417,7 +4417,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -4641,39 +4641,39 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_HDR"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/34/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 8ebe2800..3917e92e 100644
--- a/34/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -340,7 +340,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 1,
@@ -367,7 +367,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -429,7 +429,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -724,7 +724,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -810,7 +810,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -831,32 +831,7 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -990,7 +965,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3204,7 +3179,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3222,7 +3197,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3243,7 +3218,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3327,7 +3302,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5045,7 +5020,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -5054,7 +5029,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5090,7 +5065,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -5108,7 +5083,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -5144,7 +5119,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5162,7 +5137,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5207,7 +5182,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5216,7 +5191,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5225,7 +5200,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5270,7 +5245,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5324,7 +5299,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -6413,7 +6388,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -7926,7 +7901,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -7966,7 +7941,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9588,7 +9563,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9628,7 +9603,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9816,7 +9791,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9866,7 +9841,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9876,7 +9851,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9886,7 +9861,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9896,7 +9871,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10180,7 +10155,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10217,7 +10192,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -10247,7 +10222,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10309,7 +10284,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10386,7 +10361,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10458,7 +10433,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10474,7 +10449,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10522,7 +10497,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10564,7 +10539,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10601,7 +10576,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10648,7 +10623,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10695,7 +10670,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -10849,7 +10824,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -10935,7 +10910,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10956,7 +10931,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -10992,7 +10967,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -11144,7 +11119,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11311,7 +11286,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -11327,7 +11302,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -11348,7 +11323,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11405,7 +11380,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11426,7 +11401,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11513,7 +11488,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11595,7 +11570,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11673,7 +11648,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -11739,7 +11714,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11760,7 +11735,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11776,7 +11751,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11797,7 +11772,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -11879,7 +11854,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -11895,7 +11870,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -11925,7 +11900,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -11941,7 +11916,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -12261,7 +12236,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -12307,7 +12282,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -15107,7 +15082,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15129,7 +15104,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15151,7 +15126,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -16874,7 +16849,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16883,7 +16858,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16898,7 +16873,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16907,7 +16882,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16922,7 +16897,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16931,7 +16906,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16946,7 +16921,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16955,7 +16930,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -37140,7 +37115,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -41704,7 +41679,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -41744,7 +41719,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -41754,7 +41729,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -41764,7 +41739,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -42560,7 +42535,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -42569,7 +42544,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm_arm64/source-based/android.hidl.token@1.0-utils.so.lsdump b/34/64/arm_arm64/source-based/android.hidl.token@1.0-utils.so.lsdump
index 1949b6e0..900521b8 100644
--- a/34/64/arm_arm64/source-based/android.hidl.token@1.0-utils.so.lsdump
+++ b/34/64/arm_arm64/source-based/android.hidl.token@1.0-utils.so.lsdump
@@ -5946,12 +5946,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/arm_arm64/source-based/libRSCpuRef.so.lsdump b/34/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
index ca92679c..ca27daa0 100644
--- a/34/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
+++ b/34/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -214,7 +214,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -322,7 +322,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -394,7 +394,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -601,7 +601,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -700,7 +700,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -744,7 +744,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "is_of_unknown_bound" : true,
@@ -4679,7 +4679,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5404,7 +5404,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5723,7 +5723,7 @@
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5831,7 +5831,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5847,11 +5847,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5860,7 +5860,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6105,32 +6105,7 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6264,7 +6239,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -9291,7 +9266,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9330,7 +9305,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9369,7 +9344,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9753,7 +9728,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9771,7 +9746,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9804,7 +9779,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9819,7 +9794,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9837,7 +9812,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9855,7 +9830,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9882,7 +9857,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9918,7 +9893,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9936,7 +9911,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9957,7 +9932,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9981,7 +9956,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10017,7 +9992,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10056,7 +10031,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10092,7 +10067,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10131,7 +10106,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10164,7 +10139,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10182,7 +10157,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10299,7 +10274,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10320,7 +10295,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11682,7 +11657,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11700,7 +11675,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -21917,7 +21892,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -21935,7 +21910,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21944,7 +21919,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21953,7 +21928,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -21998,7 +21973,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22016,7 +21991,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22088,7 +22063,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -22097,7 +22072,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -22106,7 +22081,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22115,7 +22090,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22133,7 +22108,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -22169,7 +22144,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -22187,7 +22162,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -22277,7 +22252,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22295,7 +22270,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22313,7 +22288,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22475,7 +22450,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22484,7 +22459,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22493,7 +22468,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22502,7 +22477,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22511,7 +22486,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22520,7 +22495,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22529,7 +22504,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22547,7 +22522,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22556,7 +22531,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22565,7 +22540,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22574,7 +22549,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22583,7 +22558,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22592,7 +22567,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22601,7 +22576,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22610,7 +22585,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22619,7 +22594,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22628,7 +22603,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22691,7 +22666,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22700,7 +22675,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23168,7 +23143,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -23177,7 +23152,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -23258,7 +23233,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23303,7 +23278,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23312,7 +23287,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23339,7 +23314,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -23462,8 +23437,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23912,8 +23887,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26309,7 +26284,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -29918,7 +29893,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -29972,7 +29947,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30233,7 +30208,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -30377,7 +30352,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -30449,7 +30424,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -30630,7 +30605,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30698,7 +30673,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -30748,7 +30723,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -30758,7 +30733,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30798,7 +30773,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34411,7 +34386,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34454,7 +34429,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34724,7 +34699,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34754,7 +34729,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34952,7 +34927,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35002,7 +34977,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35012,7 +34987,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35022,7 +34997,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35032,7 +35007,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35448,7 +35423,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35641,7 +35616,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -35697,7 +35672,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -35750,7 +35725,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -35780,7 +35755,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35842,7 +35817,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36082,7 +36057,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36216,7 +36191,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36257,7 +36232,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36273,7 +36248,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36408,7 +36383,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36552,7 +36527,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36568,7 +36543,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36635,7 +36610,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -36651,7 +36626,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36856,7 +36831,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36903,7 +36878,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36945,7 +36920,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37082,7 +37057,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -37369,7 +37344,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37460,7 +37435,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37546,7 +37521,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -37567,7 +37542,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -37603,7 +37578,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -37755,7 +37730,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -37902,7 +37877,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -37923,7 +37898,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38147,7 +38122,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -38178,7 +38153,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38214,7 +38189,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38235,7 +38210,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38394,7 +38369,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38493,7 +38468,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -38559,7 +38534,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38580,7 +38555,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -38596,7 +38571,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -38678,7 +38653,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38694,7 +38669,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -38724,7 +38699,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -38740,7 +38715,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39060,7 +39035,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -39106,7 +39081,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -45350,7 +45325,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45431,7 +45406,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46206,7 +46181,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46223,7 +46198,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46233,7 +46208,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46250,7 +46225,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49815,7 +49790,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49837,7 +49812,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49859,7 +49834,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -55369,7 +55344,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55378,7 +55353,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55393,7 +55368,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55402,7 +55377,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55417,7 +55392,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55426,7 +55401,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55441,7 +55416,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55450,7 +55425,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126879,7 +126854,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -126888,7 +126863,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -126906,7 +126881,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2>",
+   "name" : "std::__make_tuple_indices<2, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -148554,7 +148529,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -148594,7 +148569,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -148604,7 +148579,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -148614,7 +148589,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -148717,7 +148692,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148831,7 +148806,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148945,7 +148920,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -149044,7 +149019,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -149863,7 +149838,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -149872,7 +149847,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm_arm64/source-based/libRSDriver.so.lsdump b/34/64/arm_arm64/source-based/libRSDriver.so.lsdump
index 4833f13c..8f8a2813 100644
--- a/34/64/arm_arm64/source-based/libRSDriver.so.lsdump
+++ b/34/64/arm_arm64/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -295,7 +295,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -322,7 +322,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -538,7 +538,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -564,7 +564,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4563,7 +4563,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5300,7 +5300,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5864,7 +5864,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5880,71 +5880,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6106,7 +6106,7 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6156,31 +6156,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
@@ -6307,7 +6282,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8309,7 +8284,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8327,7 +8302,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8366,7 +8341,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10109,7 +10084,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10507,7 +10482,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10531,7 +10506,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11218,7 +11193,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24242,7 +24217,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24395,7 +24370,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24431,7 +24406,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -24485,7 +24460,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24512,7 +24487,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24926,7 +24901,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24935,7 +24910,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24953,7 +24928,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25592,7 +25567,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -26363,8 +26338,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -29120,7 +29095,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -29255,7 +29230,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -29354,7 +29329,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -29554,7 +29529,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -31752,7 +31727,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31952,7 +31927,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31962,7 +31937,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32190,7 +32165,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32200,7 +32175,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32210,7 +32185,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32220,7 +32195,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -32338,7 +32313,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -32700,7 +32675,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -32753,7 +32728,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -32783,7 +32758,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -32845,7 +32820,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -33085,7 +33060,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -33387,7 +33362,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33403,7 +33378,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33590,7 +33565,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33653,7 +33628,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33791,7 +33766,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33957,7 +33932,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -34092,7 +34067,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -34484,7 +34459,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34570,7 +34545,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34622,7 +34597,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -34658,7 +34633,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -34882,7 +34857,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -34903,7 +34878,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35072,7 +35047,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -35093,7 +35068,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35320,7 +35295,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35419,7 +35394,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -35485,7 +35460,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -35506,7 +35481,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35690,7 +35665,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35711,7 +35686,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -35793,7 +35768,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -35809,7 +35784,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -35855,7 +35830,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35871,7 +35846,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36191,7 +36166,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -36237,7 +36212,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "access" : "protected",
@@ -43450,7 +43425,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43472,7 +43447,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -43517,7 +43492,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -68440,7 +68415,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
diff --git a/34/64/arm_arm64/source-based/libRS_internal.so.lsdump b/34/64/arm_arm64/source-based/libRS_internal.so.lsdump
index 59f22204..020e0d8c 100644
--- a/34/64/arm_arm64/source-based/libRS_internal.so.lsdump
+++ b/34/64/arm_arm64/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -574,7 +574,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -681,7 +681,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "is_of_unknown_bound" : true,
@@ -6136,7 +6136,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7140,7 +7140,7 @@
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8196,7 +8196,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -8212,71 +8212,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8418,7 +8418,7 @@
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8468,31 +8468,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
@@ -8619,7 +8594,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8697,7 +8672,7 @@
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11655,7 +11630,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11673,7 +11648,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11712,7 +11687,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13779,7 +13754,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13836,7 +13811,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -31855,7 +31830,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35878,7 +35853,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -35923,7 +35898,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36157,7 +36132,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36202,7 +36177,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -36229,7 +36204,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -36265,7 +36240,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36292,7 +36267,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36400,7 +36375,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36409,7 +36384,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36427,7 +36402,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37210,7 +37185,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37237,7 +37212,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37426,7 +37401,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -37666,8 +37641,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37909,8 +37884,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37918,8 +37893,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37927,8 +37902,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37936,8 +37911,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40801,7 +40776,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -40873,7 +40848,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -45049,7 +45024,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -45193,7 +45168,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -45283,7 +45258,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -45404,7 +45379,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45554,7 +45529,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49532,7 +49507,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49892,7 +49867,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49902,7 +49877,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49982,7 +49957,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50090,7 +50065,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50140,7 +50115,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50150,7 +50125,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50160,7 +50135,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50170,7 +50145,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50689,7 +50664,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51053,7 +51028,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -51083,7 +51058,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51145,7 +51120,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -51385,7 +51360,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -52178,7 +52153,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52194,7 +52169,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52422,7 +52397,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52776,7 +52751,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52791,7 +52766,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -53002,7 +52977,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53317,7 +53292,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53438,7 +53413,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -54066,7 +54041,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -54178,7 +54153,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54264,7 +54239,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54316,7 +54291,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54352,7 +54327,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -54504,7 +54479,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54661,7 +54636,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54677,7 +54652,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -54698,7 +54673,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54719,7 +54694,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54765,7 +54740,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 28,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55015,7 +54990,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -55046,7 +55021,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 4,
@@ -55072,7 +55047,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55108,7 +55083,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55129,7 +55104,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55165,7 +55140,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55407,7 +55382,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55506,7 +55481,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55527,7 +55502,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55593,7 +55568,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -55614,7 +55589,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -55702,7 +55677,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55723,7 +55698,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -55805,7 +55780,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55821,7 +55796,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -55851,7 +55826,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -55867,7 +55842,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56187,7 +56162,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -56233,7 +56208,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56505,7 +56480,7 @@
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56527,7 +56502,7 @@
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -68907,7 +68882,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68929,7 +68904,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68951,7 +68926,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -73455,7 +73430,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73464,7 +73439,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73479,7 +73454,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73488,7 +73463,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73503,7 +73478,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73512,7 +73487,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73527,7 +73502,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73536,7 +73511,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -124972,7 +124947,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138460,7 +138435,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -138603,7 +138578,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146157,7 +146132,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -155482,7 +155457,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -155522,7 +155497,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -155532,7 +155507,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -155542,7 +155517,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -156300,7 +156275,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -156309,7 +156284,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/arm_arm64/source-based/libaudioutils.so.lsdump b/34/64/arm_arm64/source-based/libaudioutils.so.lsdump
index a2f72609..98fe0b7a 100644
--- a/34/64/arm_arm64/source-based/libaudioutils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libaudioutils.so.lsdump
@@ -1999,14 +1999,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE25__emplace_unique_key_argsIjJRKNS_4pairIKjS6_EEEEENSK_INS_15__hash_iteratorIPNS_11__hash_nodeIS7_PvEEEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE8__rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112basic_stringIhNS_11char_traitsIhEENS_9allocatorIhEEE21__grow_by_and_replaceEjjjjjjPKh"
   },
   {
@@ -3198,7 +3190,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3436,119 +3428,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 2214592512,
+     "enum_field_value" : -2080374784,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : 2281701376,
+     "enum_field_value" : -2013265920,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : 2281701377,
+     "enum_field_value" : -2013265919,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : 2415919104,
+     "enum_field_value" : -1879048192,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : 2684354560,
+     "enum_field_value" : -1610612736,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3560,15 +3552,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4371,15 +4363,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 3743416319,
+     "enum_field_value" : -551550977,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4861,99 +4853,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : 2147484159,
+     "enum_field_value" : -2147483137,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : 2147484671,
+     "enum_field_value" : -2147482625,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : 2147485695,
+     "enum_field_value" : -2147481601,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : 2147487743,
+     "enum_field_value" : -2147479553,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : 2147491839,
+     "enum_field_value" : -2147475457,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : 2147500031,
+     "enum_field_value" : -2147467265,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : 2147516415,
+     "enum_field_value" : -2147450881,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : 2147549183,
+     "enum_field_value" : -2147418113,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : 2147614719,
+     "enum_field_value" : -2147352577,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : 2147745791,
+     "enum_field_value" : -2147221505,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : 2148007935,
+     "enum_field_value" : -2146959361,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : 2148532223,
+     "enum_field_value" : -2146435073,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : 2149580799,
+     "enum_field_value" : -2145386497,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : 2151677951,
+     "enum_field_value" : -2143289345,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : 2155872255,
+     "enum_field_value" : -2139095041,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : 2164260863,
+     "enum_field_value" : -2130706433,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4969,7 +4961,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5691,7 +5683,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5766,7 +5758,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5787,7 +5779,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -15174,7 +15166,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -16804,7 +16796,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 4,
@@ -16813,7 +16805,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 4,
@@ -16822,7 +16814,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 4,
@@ -16939,7 +16931,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -21639,7 +21631,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 96,
@@ -21665,7 +21657,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 160,
@@ -21691,7 +21683,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 64,
@@ -22029,7 +22021,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/arm_arm64/source-based/libbase.so.lsdump b/34/64/arm_arm64/source-based/libbase.so.lsdump
index f2be966a..41f9fe0e 100644
--- a/34/64/arm_arm64/source-based/libbase.so.lsdump
+++ b/34/64/arm_arm64/source-based/libbase.so.lsdump
@@ -1048,21 +1048,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -1899,7 +1890,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1950,7 +1941,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2706,7 +2697,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2740,7 +2731,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4747,23 +4738,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -4782,22 +4756,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -4814,22 +4772,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
diff --git a/34/64/arm_arm64/source-based/libbinder.so.lsdump b/34/64/arm_arm64/source-based/libbinder.so.lsdump
index c7a638d2..d8c04ea0 100644
--- a/34/64/arm_arm64/source-based/libbinder.so.lsdump
+++ b/34/64/arm_arm64/source-based/libbinder.so.lsdump
@@ -73,15 +73,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA1_Ds",
-   "name" : "char16_t[1]",
-   "referenced_type" : "_ZTIDs",
-   "self_type" : "_ZTIA1_Ds",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA1_N3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>>[1]",
@@ -100,6 +91,15 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "linker_set_key" : "_ZTIA20_Ds",
+   "name" : "char16_t[20]",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIA20_Ds",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA20_y",
    "name" : "unsigned long long[20]",
@@ -1066,6 +1066,34 @@
    "name" : "_ZN7android10zeroMemoryEPhj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv"
+  },
+  {
    "name" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE"
   },
   {
@@ -1837,6 +1865,214 @@
    "name" : "_ZN7android2os20ParcelFileDescriptorD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9HeapCacheEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_"
+  },
+  {
    "name" : "_ZN7android33makeDefaultRpcTransportCtxFactoryEv"
   },
   {
@@ -1921,21 +2157,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -2101,6 +2328,22 @@
    "name" : "_ZN7android4base8EndsWithENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEc"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_"
+  },
+  {
    "name" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_"
   },
   {
@@ -2116,6 +2359,22 @@
    "name" : "_ZN7android4base9ParseBoolENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
+  },
+  {
    "name" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj"
   },
   {
@@ -2167,6 +2426,14 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
+  },
+  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2305,9 +2572,6 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
-   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
-  },
-  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2515,9 +2779,6 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
-   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
-  },
-  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3055,9 +3316,6 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
-   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
-  },
-  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3268,10 +3526,7 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
-  },
-  {
-   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3589,6 +3844,22 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
+  },
+  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3718,9 +3989,6 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
-   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
-  },
-  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3739,6 +4007,14 @@
    "name" : "_ZNK7android6Parcel16readStrongBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3922,6 +4198,198 @@
    "name" : "_ZNK7android6Parcel9readInt64Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+  },
+  {
    "name" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE"
   },
   {
@@ -4028,10 +4496,462 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7__cloneEPNS0_6__baseISB_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7__cloneEPNS0_6__baseIS8_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7__cloneEPNS0_6__baseIS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7__cloneEPNS0_6__baseIS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7__cloneEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE14__count_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEclES3_S4_S6_S6_jS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EE7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIN7android4base10LogdLoggerENS_9allocatorIS4_EEFvNS3_5LogIdENS3_11LogSeverityEPKcSA_jSA_EEclEOS7_OS8_OSA_SF_OjSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFiRKN7android9RpcServerEPNS2_14RpcTransportFdEENS_9allocatorIS9_EES8_EclES5_OS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvON7android2spINS2_10RpcSessionEEEONS4_18PreJoinSetupResultEENS_9allocatorISA_EES9_EclES6_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E18destroy_deallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_E7destroyEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110__function6__funcIPFvPKcENS_9allocatorIS5_EES4_EclEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__110shared_ptrIN7android6binder8internal21ClientCounterCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111__sift_downIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeESB_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRKNS_21piecewise_construct_tENS_5tupleIJRKiEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE4findIiEENS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS2_PvEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeIS2_PvEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__lower_boundIRNS_6__lessIjjEENS_11__wrap_iterIPKjEEjEET0_S8_S8_RKT1_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIDsNS_9allocatorIDsEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android8String16ENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIdNS_9allocatorIdEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIfNS_9allocatorIfEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIjNS_9allocatorIjEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIxNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIyNS_9allocatorIyEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113unordered_mapIijNS_4hashIiEENS_8equal_toIiEENS_9allocatorINS_4pairIKijEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__copy_alignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__copy_alignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__fill_n_falseINS_8__bitsetILj1ELj8EEEEEvNS_14__bit_iteratorIT_Lb0ELi0EEENS4_9size_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIDsRNS_9allocatorIDsEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSessionEEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSessionEEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_7IBinderEEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_7IBinderEEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4base14unique_fd_implINS2_13DefaultCloserEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4base14unique_fd_implINS2_13DefaultCloserEEERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8RpcState10BinderNode9AsyncTodoERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8RpcState10BinderNode9AsyncTodoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEEC2EjjS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8String16ERNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEERNS5_ISA_EEEC2EjjSC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEERNS5_ISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEEC2EjjSD_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEERNS_9allocatorIS8_EEEC2EjjSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEERNS_9allocatorIS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalIN7android8String16EEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalIN7android8String16EEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIfRNS_9allocatorIfEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIfRNS_9allocatorIfEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIiRNS_9allocatorIiEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIjRNS_9allocatorIjEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIyRNS_9allocatorIyEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIyRNS_9allocatorIyEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4040,9 +4960,1329 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS1_2os17PersistableBundleENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S4_EEEEEixERS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIS2_NS_9allocatorIS2_EEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ES2_NS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S2_EEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EbNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_bEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EdNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_dEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EiNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_iEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ExNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_xEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_11__thread_idENS_6threadENS_4lessIS1_EENS_9allocatorINS_4pairIKS1_S2_EEEEEixEOS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceENS_4lessIS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINS9_15IServiceManager25LocalRegistrationCallbackEEENSA_INS9_18ServiceManagerShim18RegistrationWaiterEEEEENS4_ISH_EEEENS_4lessIS6_EENS4_INS8_IKS6_SJ_EEEEEixERSM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__construct_nodeIJRS5_EEENS_10unique_ptrINS_11__tree_nodeIS5_PvEENS_22__tree_node_destructorINS8_ISG_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSF_SF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE25__emplace_unique_key_argsIS5_JRS5_EEENS_4pairINS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE12__find_equalIS2_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISC_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSC_SC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE25__emplace_unique_key_argsIS2_JRKS2_EEENS_4pairINS_15__tree_iteratorIS2_PNS_11__tree_nodeIS2_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISK_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS5_JNS_4pairIKS5_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE4findIS5_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SG_EEiEERPNS_15__tree_end_nodeISI_EESJ_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISI_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE15__emplace_multiIJRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISQ_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_4pairIKS3_S5_EEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISN_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSI_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SO_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE8__detachEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_4pairIKS3_S3_EEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISL_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE13__move_assignERSB_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS2_JRKNS_21piecewise_construct_tENS_5tupleIJOS2_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSO_SO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISW_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSW_SW_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSW_IJEEEEEENS9_INS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE4findIS7_EENS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE5eraseENS_21__tree_const_iteratorISL_PNS_11__tree_nodeISL_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE7destroyEPNS_11__tree_nodeISL_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE13__lower_boundIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_SM_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISK_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE25__emplace_unique_key_argsIS5_JRKNS_21piecewise_construct_tENS_5tupleIJRKS5_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE4findIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE5eraseENS_21__tree_const_iteratorISA_PNS_11__tree_nodeISA_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE7destroyEPNS_11__tree_nodeISA_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSH_SH_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsIyJNS_4pairIKyS4_EEEEENSE_INS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE24__emplace_back_slow_pathIJDsEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE26__swap_out_circular_bufferERNS_14__split_bufferIDsRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE21__push_back_slow_pathIRKS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSessionEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6assignIPS2_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS2_NS_15iterator_traitsIS9_E9referenceEEE5valueEvE4typeES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIS6_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE21__push_back_slow_pathISA_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE26__swap_out_circular_bufferERNS_14__split_bufferISA_RSC_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE21__push_back_slow_pathIS8_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE24__emplace_back_slow_pathIJS6_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RSA_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE12__move_rangeEPS1_S5_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertENS_11__wrap_iterIPKS1_EEjRS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPKS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS9_E9referenceEEE5valueENS_11__wrap_iterIPS1_EEE4typeENSD_IS7_EES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIS6_EEE4typeENSC_IPKS1_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE9push_backERKb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6assignIPdEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIdNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE26__swap_out_circular_bufferERNS_14__split_bufferIfRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6assignIPiEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIRKjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE26__swap_out_circular_bufferERNS_14__split_bufferIjRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE26__swap_out_circular_bufferERNS_14__split_bufferIyRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__19__sift_upIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "_ZThn4_N7android10AllocationD0Ev"
   },
   {
@@ -4304,9 +6544,15 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
+   "name" : "_ZN7android16kEnableRecordingE"
+  },
+  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
+   "name" : "_ZN7android20kEnableRpcDevServersE"
+  },
+  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -4743,6 +6989,10 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android10PoolThreadE"
+  },
+  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -4770,6 +7020,10 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android15BpShellCallbackE"
+  },
+  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -4779,6 +7033,14 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android16BpResultReceiverE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
+  },
+  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -4842,6 +7104,14 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -4910,10 +7180,6 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTVN7android15RpcTransportRawE"
-  },
-  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -4937,10 +7203,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android18RpcTransportCtxRawE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -6475,7 +8737,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -6526,7 +8788,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -10913,6 +13175,104 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemoryHeap>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IShellCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IResultReceiver>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IClientCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceManager>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemory>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
    "function_name" : "android::IMemoryHeap::asInterface",
    "linker_set_key" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE",
    "parameters" :
@@ -13398,6 +15758,849 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::WaitForShutdownListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession23WaitForShutdownListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_12ProcessStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12ProcessStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_12ProcessStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15BpShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android15BpShellCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_16BpResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android16BpResultReceiverE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager::LocalRegistrationCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShimEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android18ServiceManagerShimE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::BufferedTextOutput::BufferState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18BufferedTextOutput11BufferStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os17BpServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os17BpServiceCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::binder::internal::ClientCounterCallbackImpl>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7BBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::clear",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpBinderE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android10AllocationE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpMemoryE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::HeapCache>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_9HeapCacheEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9HeapCacheEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::clear",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h",
+   "template_args" :
+   [
+    "_ZTIN7android10RpcSession23WaitForShutdownListenerE"
+   ]
+  },
+  {
+   "function_name" : "android::wp<android::IBinder::DeathRecipient>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinder14DeathRecipientEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinder14DeathRecipientEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinder14DeathRecipientEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::base::LogMessage::stream",
    "linker_set_key" : "_ZN7android4base10LogMessage6streamEv",
    "parameters" :
@@ -13919,23 +17122,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -13954,22 +17140,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -13986,22 +17156,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
@@ -14650,6 +17804,114 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIa"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIs"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
    "function_name" : "android::base::Readlink",
    "linker_set_key" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_",
    "parameters" :
@@ -14722,6 +17984,114 @@
    "source_file" : "system/libbase/include/android-base/parsebool.h"
   },
   {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIh"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIj"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIt"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::base::ReadFully",
    "linker_set_key" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj",
    "parameters" :
@@ -15002,6 +18372,48 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIxEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIyEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::writeCString",
    "linker_set_key" : "_ZN7android6Parcel12writeCStringEPKc",
    "parameters" :
@@ -15747,19 +19159,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::setServiceFuzzing",
-   "linker_set_key" : "_ZN7android6Parcel17setServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::writeDoubleVector",
    "linker_set_key" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -16867,12 +20266,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
   },
   {
-   "function_name" : "android::binder::LazyServiceRegistrar::createExtraTestInstance",
-   "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv",
-   "return_type" : "_ZTIN7android6binder20LazyServiceRegistrarE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
-  },
-  {
    "function_name" : "android::binder::LazyServiceRegistrar::setActiveServicesCallback",
    "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE",
    "parameters" :
@@ -17667,7 +21060,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -17681,7 +21073,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -19482,7 +22873,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIb",
+   "return_type" : "_ZTIv",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -19628,23 +23019,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android9RpcServerE"
-    },
-    {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "function_name" : "android::RpcServer::setServerSocketModifier",
-   "linker_set_key" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -19652,7 +23027,7 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21568,19 +24943,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::isServiceFuzzing",
-   "linker_set_key" : "_ZNK7android6Parcel16isServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPKN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::readDoubleVector",
    "linker_set_key" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -21671,6 +25033,46 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os15IClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16IServiceCallbackE"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::readUint64Vector",
    "linker_set_key" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -22619,6 +26021,1062 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "function_name" : "android::binder::debug::RecordedTransaction::dumpToFile",
    "linker_set_key" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE",
    "parameters" :
@@ -23449,10 +27907,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA1_KDs",
-   "name" : "const char16_t (&)[1]",
-   "referenced_type" : "_ZTIA1_KDs",
-   "self_type" : "_ZTIRA1_KDs",
+   "linker_set_key" : "_ZTIRA20_KDs",
+   "name" : "const char16_t (&)[20]",
+   "referenced_type" : "_ZTIA20_KDs",
+   "self_type" : "_ZTIRA20_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -23658,7 +28116,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv8-a_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.UpsideDownCake_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -24358,10 +28816,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -26370,8 +30828,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv8-a_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv8-a_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.UpsideDownCake_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.UpsideDownCake_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29014,10 +33472,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -29698,15 +34156,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession> *",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android2wpINS_7BBinderEEE",
    "name" : "android::wp<android::BBinder> *",
    "referenced_type" : "_ZTIN7android2wpINS_7BBinderEEE",
@@ -30337,10 +34786,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -31173,16 +35622,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA1_KDs",
-   "name" : "const char16_t[1]",
-   "referenced_type" : "_ZTIA1_Ds",
-   "self_type" : "_ZTIA1_KDs",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA1_KPKc",
@@ -31193,6 +35632,16 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIA20_KDs",
+   "name" : "const char16_t[20]",
+   "referenced_type" : "_ZTIA20_Ds",
+   "self_type" : "_ZTIA20_KDs",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Ky",
@@ -33441,11 +37890,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -33565,7 +38014,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -34966,46 +39415,6 @@
      "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android15RpcTransportRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportCtxRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android18RpcTransportCtxRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
    "name" : "libutilsinternal::is_complete_type<android::Parcel, void>",
    "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
@@ -46083,15 +50492,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "size" : 12,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "size" : 48,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -49562,7 +53971,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -49612,34 +54021,6 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android10RpcSessionE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android7RefBase12weakref_typeE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android10RpcSessionE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "_ZTIPN7android7BBinderE"
     },
     {
@@ -57122,12 +61503,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -59229,14 +63604,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA1_Ds"
+     "referenced_type" : "_ZTIA20_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -59678,7 +64053,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -59688,32 +64063,26 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServerSocketModifier",
-     "field_offset" : 960,
-     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
-    },
-    {
-     "access" : "private",
      "field_name" : "mSessions",
-     "field_offset" : 1152,
+     "field_offset" : 960,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1248,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1280,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1344,
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -59722,12 +64091,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 192,
+     "component_value" : 168,
      "kind" : "vbase_offset"
     },
     {
@@ -59764,11 +64133,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "offset_to_top"
     },
     {
@@ -60915,10 +65284,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "name" : "std::function<sp<IBinder> (wp<RpcSession>, const void *, unsigned int)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
+   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "name" : "std::function<sp<IBinder> (const void *, unsigned int)> &&",
+   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -60951,15 +65320,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "name" : "std::function<void (borrowed_fd)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "self_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "name" : "std::function<void (LogId, LogSeverity, const char *, const char *, unsigned int, const char *)> &&",
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
diff --git a/34/64/arm_arm64/source-based/libc++.so.lsdump b/34/64/arm_arm64/source-based/libc++.so.lsdump
index 1bae4a39..3f3f12fb 100644
--- a/34/64/arm_arm64/source-based/libc++.so.lsdump
+++ b/34/64/arm_arm64/source-based/libc++.so.lsdump
@@ -2596,6 +2596,14 @@
    "name" : "_ZNSt3__112__next_primeEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__112__rs_defaultC1ERKS0_"
   },
   {
@@ -3758,6 +3766,10 @@
    "name" : "_ZNSt3__114__num_put_base18__identify_paddingEPcS1_RKNS_8ios_baseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__114__shared_count12__add_sharedEv"
   },
   {
@@ -4398,10 +4410,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_"
   },
   {
@@ -4417,6 +4453,22 @@
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIssEEPsEEvT0_S5_T_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_"
+  },
+  {
    "name" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE"
   },
   {
@@ -4592,6 +4644,10 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
+  },
+  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -4980,10 +5036,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_"
   },
   {
@@ -5000,10 +5080,50 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_"
   },
   {
@@ -5020,6 +5140,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9802,7 +9938,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_grouping",
+   "function_name" : "std::moneypunct<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9816,7 +9952,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_neg_format",
+   "function_name" : "std::moneypunct<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9830,7 +9966,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_pos_format",
+   "function_name" : "std::moneypunct<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9844,7 +9980,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9858,7 +9994,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_frac_digits",
+   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9872,7 +10008,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_decimal_point",
+   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -9886,7 +10022,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_negative_sign",
+   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -9900,7 +10036,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_positive_sign",
+   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -9914,7 +10050,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10054,7 +10190,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10068,7 +10204,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10082,7 +10218,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10096,7 +10232,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10110,7 +10246,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10124,7 +10260,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10138,7 +10274,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10152,7 +10288,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10166,7 +10302,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13085,7 +13221,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13099,7 +13235,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13113,7 +13249,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13127,7 +13263,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13141,7 +13277,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13155,7 +13291,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13169,7 +13305,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13183,7 +13319,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13197,7 +13333,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13337,7 +13473,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13351,7 +13487,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13365,7 +13501,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13379,7 +13515,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13393,7 +13529,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13407,7 +13543,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13421,7 +13557,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13435,7 +13571,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13449,7 +13585,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20180,6 +20316,50 @@
    "source_file" : "external/libcxx/include/__hash_table"
   },
   {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPcEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPcEE"
+   ]
+  },
+  {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__rs_default::__rs_default",
    "linker_set_key" : "_ZNSt3__112__rs_defaultC1ERKS0_",
    "parameters" :
@@ -25610,6 +25790,25 @@
    "source_file" : "external/libcxx/include/locale"
   },
   {
+   "function_name" : "std::__rotate_right",
+   "linker_set_key" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__shared_count::__add_shared",
    "linker_set_key" : "_ZNSt3__114__shared_count12__add_sharedEv",
    "parameters" :
@@ -28360,7 +28559,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char>::init",
+   "function_name" : "std::moneypunct_byname<char, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28394,7 +28593,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28428,6 +28627,121 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_",
    "parameters" :
    [
@@ -28451,6 +28765,29 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_",
    "parameters" :
    [
@@ -28542,6 +28879,98 @@
    ]
   },
   {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "access" : "private",
    "function_name" : "std::__time_get_storage<char>::init",
    "linker_set_key" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE",
@@ -29353,6 +29782,19 @@
    "source_file" : "external/libcxx/include/memory"
   },
   {
+   "function_name" : "std::mersenne_twister_engine<unsigned int, 32, 624, 397, 31, 2567483615, 11, 4294967295, 7, 2636928640, 15, 4022730752, 18, 1812433253>::operator()",
+   "linker_set_key" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/random"
+  },
+  {
    "function_name" : "std::__libcpp_debug_exception::__libcpp_debug_exception",
    "linker_set_key" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE",
    "parameters" :
@@ -31393,6 +31835,136 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31419,6 +31991,32 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31522,6 +32120,255 @@
    ]
   },
   {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
    "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_",
    "parameters" :
@@ -31552,6 +32399,35 @@
   },
   {
    "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_",
    "parameters" :
    [
@@ -31667,6 +32543,122 @@
    ]
   },
   {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "function_name" : "std::__sort5",
    "linker_set_key" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -34563,13 +35555,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char>::id",
+   "name" : "std::moneypunct<char, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char>::intl",
+   "name" : "std::moneypunct<char, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -34587,13 +35579,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t>::id",
+   "name" : "std::moneypunct<wchar_t, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t>::intl",
+   "name" : "std::moneypunct<wchar_t, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -54141,7 +55133,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54150,7 +55142,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54165,7 +55157,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54174,7 +55166,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54189,7 +55181,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54198,7 +55190,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54213,7 +55205,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54222,7 +55214,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -114267,7 +115259,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -114276,7 +115268,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -134531,7 +135523,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -134541,7 +135533,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000>",
+   "name" : "std::ratio<1000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -134581,7 +135573,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -134591,7 +135583,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -134601,7 +135593,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -135713,7 +136705,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -135722,7 +136714,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135731,7 +136723,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "size" : 1,
@@ -135745,7 +136737,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135754,7 +136746,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135791,7 +136783,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135800,7 +136792,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135837,7 +136829,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135846,7 +136838,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135883,7 +136875,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135892,7 +136884,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135929,7 +136921,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135938,7 +136930,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135975,7 +136967,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -135984,7 +136976,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136053,7 +137045,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "size" : 1,
@@ -136062,7 +137054,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136177,7 +137169,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136186,7 +137178,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
diff --git a/34/64/arm_arm64/source-based/libcap.so.lsdump b/34/64/arm_arm64/source-based/libcap.so.lsdump
index 97b70a79..31579a59 100644
--- a/34/64/arm_arm64/source-based/libcap.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcap.so.lsdump
@@ -50,6 +50,9 @@
  "elf_functions" :
  [
   {
+   "name" : "_libcap_strdup"
+  },
+  {
    "name" : "cap_clear"
   },
   {
@@ -77,9 +80,6 @@
    "name" : "cap_fill"
   },
   {
-   "name" : "cap_fill_flag"
-  },
-  {
    "name" : "cap_free"
   },
   {
@@ -122,21 +122,12 @@
    "name" : "cap_get_secbits"
   },
   {
-   "name" : "cap_iab_compare"
-  },
-  {
-   "name" : "cap_iab_dup"
-  },
-  {
    "name" : "cap_iab_fill"
   },
   {
    "name" : "cap_iab_from_text"
   },
   {
-   "name" : "cap_iab_get_pid"
-  },
-  {
    "name" : "cap_iab_get_proc"
   },
   {
@@ -194,9 +185,6 @@
    "name" : "cap_prctlw"
   },
   {
-   "name" : "cap_proc_root"
-  },
-  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -534,27 +522,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_fill_flag",
-   "linker_set_key" : "cap_fill_flag",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    },
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_free",
    "linker_set_key" : "cap_free",
    "parameters" :
@@ -717,33 +684,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_compare",
-   "linker_set_key" : "cap_iab_compare",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    },
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
-   "function_name" : "cap_iab_dup",
-   "linker_set_key" : "cap_iab_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_fill",
    "linker_set_key" : "cap_iab_fill",
    "parameters" :
@@ -777,18 +717,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_get_pid",
-   "linker_set_key" : "cap_iab_get_pid",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_get_proc",
    "linker_set_key" : "cap_iab_get_proc",
    "return_type" : "_ZTIP9cap_iab_s",
@@ -896,7 +824,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -911,7 +839,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -941,7 +869,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -962,7 +890,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -977,7 +905,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1071,18 +999,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_proc_root",
-   "linker_set_key" : "cap_proc_root",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPc",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_reset_ambient",
    "linker_set_key" : "cap_reset_ambient",
    "return_type" : "_ZTIi",
diff --git a/34/64/arm_arm64/source-based/libcodec2.so.lsdump b/34/64/arm_arm64/source-based/libcodec2.so.lsdump
index 3c7778bb..90236a9c 100644
--- a/34/64/arm_arm64/source-based/libcodec2.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcodec2.so.lsdump
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1269,7 +1269,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -1285,11 +1285,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -1298,7 +1298,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1755,7 +1755,7 @@
      "name" : "C2FrameData::FLAG_CORRUPT"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
    ],
@@ -2493,7 +2493,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 18446744073709551600,
+     "enum_field_value" : -16,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3619,7 +3619,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3977,7 +3977,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_MASK"
     },
     {
@@ -3989,11 +3989,11 @@
      "name" : "C2Param::CoreIndex::KIND_TUNING"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2Param::CoreIndex::KIND_SETTING"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4281,11 +4281,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -5896,7 +5896,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "C2Setting::PARAM_KIND"
     }
    ],
@@ -5924,7 +5924,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -5942,7 +5942,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5975,7 +5975,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5990,7 +5990,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6008,7 +6008,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6026,7 +6026,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6053,7 +6053,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6074,7 +6074,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6092,7 +6092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6113,7 +6113,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6137,7 +6137,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6173,7 +6173,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6212,7 +6212,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6248,7 +6248,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6287,7 +6287,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6320,7 +6320,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6338,7 +6338,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6359,7 +6359,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6380,7 +6380,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   }
  ],
  "functions" : [],
@@ -6703,7 +6703,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6712,7 +6712,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6757,7 +6757,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6766,7 +6766,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6946,7 +6946,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7018,7 +7018,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7225,7 +7225,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7234,7 +7234,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7243,7 +7243,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7252,7 +7252,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7261,7 +7261,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7270,7 +7270,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7279,7 +7279,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7288,7 +7288,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7297,7 +7297,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7306,7 +7306,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7315,7 +7315,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7324,7 +7324,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7333,7 +7333,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7342,7 +7342,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7351,7 +7351,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7360,7 +7360,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7369,7 +7369,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7378,7 +7378,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7387,7 +7387,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7414,7 +7414,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7450,7 +7450,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7495,7 +7495,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7783,7 +7783,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7792,7 +7792,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7801,7 +7801,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -8166,7 +8166,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8226,7 +8226,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8276,7 +8276,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9021,7 +9021,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9077,7 +9077,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9561,7 +9561,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10029,7 +10029,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10621,7 +10621,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10988,7 +10988,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/arm_arm64/source-based/libcrypto.so.lsdump b/34/64/arm_arm64/source-based/libcrypto.so.lsdump
index ab312925..3bd3cdc8 100644
--- a/34/64/arm_arm64/source-based/libcrypto.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcrypto.so.lsdump
@@ -38,6 +38,15 @@
    "source_file" : "external/boringssl/src/include/openssl/cipher.h"
   },
   {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA16_y",
+   "name" : "unsigned long long[16]",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIA16_y",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1808_h",
    "name" : "unsigned char[1808]",
@@ -111,11 +120,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -604,9 +613,6 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
-   "name" : "ASN1_TIME_set_string_X509"
-  },
-  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1858,6 +1864,18 @@
    "name" : "CRYPTO_MUTEX_unlock_write"
   },
   {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_write"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_write"
+  },
+  {
    "name" : "CRYPTO_THREADID_current"
   },
   {
@@ -2608,18 +2626,6 @@
    "name" : "EC_get_builtin_curves"
   },
   {
-   "name" : "EC_group_p224"
-  },
-  {
-   "name" : "EC_group_p256"
-  },
-  {
-   "name" : "EC_group_p384"
-  },
-  {
-   "name" : "EC_group_p521"
-  },
-  {
    "name" : "EC_hash_to_curve_p256_xmd_sha256_sswu"
   },
   {
@@ -3076,15 +3082,6 @@
    "name" : "EVP_HPKE_CTX_seal"
   },
   {
-   "name" : "EVP_HPKE_CTX_setup_auth_recipient"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing"
-  },
-  {
    "name" : "EVP_HPKE_CTX_setup_recipient"
   },
   {
@@ -3520,9 +3517,6 @@
    "name" : "EVP_aead_aes_128_cbc_sha1_tls_implicit_iv"
   },
   {
-   "name" : "EVP_aead_aes_128_cbc_sha256_tls"
-  },
-  {
    "name" : "EVP_aead_aes_128_ccm_bluetooth"
   },
   {
@@ -3742,9 +3736,6 @@
    "name" : "EVP_sha256"
   },
   {
-   "name" : "EVP_sha256_final_with_secret_suffix"
-  },
-  {
    "name" : "EVP_sha384"
   },
   {
@@ -4192,69 +4183,6 @@
    "name" : "OPENSSL_secure_malloc"
   },
   {
-   "name" : "OPENSSL_sk_deep_copy"
-  },
-  {
-   "name" : "OPENSSL_sk_delete"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_if"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_ptr"
-  },
-  {
-   "name" : "OPENSSL_sk_dup"
-  },
-  {
-   "name" : "OPENSSL_sk_find"
-  },
-  {
-   "name" : "OPENSSL_sk_free"
-  },
-  {
-   "name" : "OPENSSL_sk_insert"
-  },
-  {
-   "name" : "OPENSSL_sk_is_sorted"
-  },
-  {
-   "name" : "OPENSSL_sk_new"
-  },
-  {
-   "name" : "OPENSSL_sk_new_null"
-  },
-  {
-   "name" : "OPENSSL_sk_num"
-  },
-  {
-   "name" : "OPENSSL_sk_pop"
-  },
-  {
-   "name" : "OPENSSL_sk_pop_free_ex"
-  },
-  {
-   "name" : "OPENSSL_sk_push"
-  },
-  {
-   "name" : "OPENSSL_sk_set"
-  },
-  {
-   "name" : "OPENSSL_sk_set_cmp_func"
-  },
-  {
-   "name" : "OPENSSL_sk_shift"
-  },
-  {
-   "name" : "OPENSSL_sk_sort"
-  },
-  {
-   "name" : "OPENSSL_sk_value"
-  },
-  {
-   "name" : "OPENSSL_sk_zero"
-  },
-  {
    "name" : "OPENSSL_strcasecmp"
   },
   {
@@ -4861,27 +4789,6 @@
    "name" : "RSA_new_method"
   },
   {
-   "name" : "RSA_new_method_no_e"
-  },
-  {
-   "name" : "RSA_new_private_key"
-  },
-  {
-   "name" : "RSA_new_private_key_large_e"
-  },
-  {
-   "name" : "RSA_new_private_key_no_crt"
-  },
-  {
-   "name" : "RSA_new_private_key_no_e"
-  },
-  {
-   "name" : "RSA_new_public_key"
-  },
-  {
-   "name" : "RSA_new_public_key_large_e"
-  },
-  {
    "name" : "RSA_padding_add_PKCS1_OAEP_mgf1"
   },
   {
@@ -7471,9 +7378,36 @@
    "name" : "s2i_ASN1_OCTET_STRING"
   },
   {
+   "name" : "sk_deep_copy"
+  },
+  {
+   "name" : "sk_delete"
+  },
+  {
+   "name" : "sk_delete_if"
+  },
+  {
+   "name" : "sk_delete_ptr"
+  },
+  {
+   "name" : "sk_dup"
+  },
+  {
+   "name" : "sk_find"
+  },
+  {
    "name" : "sk_free"
   },
   {
+   "name" : "sk_insert"
+  },
+  {
+   "name" : "sk_is_sorted"
+  },
+  {
+   "name" : "sk_new"
+  },
+  {
    "name" : "sk_new_null"
   },
   {
@@ -7492,9 +7426,24 @@
    "name" : "sk_push"
   },
   {
+   "name" : "sk_set"
+  },
+  {
+   "name" : "sk_set_cmp_func"
+  },
+  {
+   "name" : "sk_shift"
+  },
+  {
+   "name" : "sk_sort"
+  },
+  {
    "name" : "sk_value"
   },
   {
+   "name" : "sk_zero"
+  },
+  {
    "name" : "v2i_GENERAL_NAME"
   },
   {
@@ -8559,23 +8508,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8939,30 +8888,6 @@
      "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
     },
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
-   "name" : "int (int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
-    },
-    {
      "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -10463,21 +10388,6 @@
    "source_file" : "external/boringssl/src/include/openssl/asn1.h"
   },
   {
-   "function_name" : "ASN1_TIME_set_string_X509",
-   "linker_set_key" : "ASN1_TIME_set_string_X509",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
    "function_name" : "ASN1_TIME_to_generalizedtime",
    "linker_set_key" : "ASN1_TIME_to_generalizedtime",
    "parameters" :
@@ -16367,21 +16277,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
-   "function_name" : "EC_get_builtin_curves",
-   "linker_set_key" : "EC_get_builtin_curves",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP16EC_builtin_curve"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
    "function_name" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "linker_set_key" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "parameters" :
@@ -17441,135 +17336,6 @@
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
    "function_name" : "EVP_HPKE_CTX_setup_recipient",
    "linker_set_key" : "EVP_HPKE_CTX_setup_recipient",
    "parameters" :
@@ -19454,12 +19220,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "linker_set_key" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -20984,318 +20744,6 @@
    "source_file" : "external/boringssl/src/include/openssl/mem.h"
   },
   {
-   "function_name" : "OPENSSL_sk_deep_copy",
-   "linker_set_key" : "OPENSSL_sk_deep_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPKvE"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete",
-   "linker_set_key" : "OPENSSL_sk_delete",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_if",
-   "linker_set_key" : "OPENSSL_sk_delete_if",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPvS_E"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_ptr",
-   "linker_set_key" : "OPENSSL_sk_delete_ptr",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_dup",
-   "linker_set_key" : "OPENSSL_sk_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_find",
-   "linker_set_key" : "OPENSSL_sk_find",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_free",
-   "linker_set_key" : "OPENSSL_sk_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_insert",
-   "linker_set_key" : "OPENSSL_sk_insert",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_is_sorted",
-   "linker_set_key" : "OPENSSL_sk_is_sorted",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new",
-   "linker_set_key" : "OPENSSL_sk_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new_null",
-   "linker_set_key" : "OPENSSL_sk_new_null",
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_num",
-   "linker_set_key" : "OPENSSL_sk_num",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop",
-   "linker_set_key" : "OPENSSL_sk_pop",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop_free_ex",
-   "linker_set_key" : "OPENSSL_sk_pop_free_ex",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_push",
-   "linker_set_key" : "OPENSSL_sk_push",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set",
-   "linker_set_key" : "OPENSSL_sk_set",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set_cmp_func",
-   "linker_set_key" : "OPENSSL_sk_set_cmp_func",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIPFiPKPKvS2_E",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_shift",
-   "linker_set_key" : "OPENSSL_sk_shift",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_sort",
-   "linker_set_key" : "OPENSSL_sk_sort",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_value",
-   "linker_set_key" : "OPENSSL_sk_value",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_zero",
-   "linker_set_key" : "OPENSSL_sk_zero",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
    "function_name" : "OPENSSL_strcasecmp",
    "linker_set_key" : "OPENSSL_strcasecmp",
    "parameters" :
@@ -27811,10 +27259,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27883,7 +27331,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29899,7 +29347,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30688,7 +30136,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31933,7 +31381,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31954,7 +31402,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -36308,6 +35756,114 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
+   "function_name" : "sk_deep_copy",
+   "linker_set_key" : "sk_deep_copy",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPKvE"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPFvPvES_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPvE"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete",
+   "linker_set_key" : "sk_delete",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_if",
+   "linker_set_key" : "sk_delete_if",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPvS_E"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_ptr",
+   "linker_set_key" : "sk_delete_ptr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_dup",
+   "linker_set_key" : "sk_dup",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_find",
+   "linker_set_key" : "sk_find",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_free",
    "linker_set_key" : "sk_free",
    "parameters" :
@@ -36320,6 +35876,48 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_insert",
+   "linker_set_key" : "sk_insert",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_is_sorted",
+   "linker_set_key" : "sk_is_sorted",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_new",
+   "linker_set_key" : "sk_new",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_new_null",
    "linker_set_key" : "sk_new_null",
    "return_type" : "_ZTIP8stack_st",
@@ -36398,6 +35996,66 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_set",
+   "linker_set_key" : "sk_set",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_set_cmp_func",
+   "linker_set_key" : "sk_set_cmp_func",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIPFiPKPKvS2_E",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_shift",
+   "linker_set_key" : "sk_shift",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_sort",
+   "linker_set_key" : "sk_sort",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_value",
    "linker_set_key" : "sk_value",
    "parameters" :
@@ -36413,6 +36071,18 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_zero",
+   "linker_set_key" : "sk_zero",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "v2i_GENERAL_NAME",
    "linker_set_key" : "v2i_GENERAL_NAME",
    "parameters" :
@@ -37243,6 +36913,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
+   "name" : "bn_mont_ctx_st *",
+   "referenced_type" : "_ZTI14bn_mont_ctx_st",
+   "self_type" : "_ZTIP14bn_mont_ctx_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14private_key_st",
    "name" : "private_key_st *",
    "referenced_type" : "_ZTI14private_key_st",
@@ -37360,15 +37048,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP16EC_builtin_curve",
-   "name" : "EC_builtin_curve *",
-   "referenced_type" : "_ZTI16EC_builtin_curve",
-   "self_type" : "_ZTIP16EC_builtin_curve",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP16HRSS_private_key",
    "name" : "HRSS_private_key *",
    "referenced_type" : "_ZTI16HRSS_private_key",
@@ -38260,10 +37939,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *, const void *)",
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "self_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
+   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38415,15 +38094,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
    "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
-   "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
    "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -38694,15 +38364,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -39484,21 +39145,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKl",
-   "name" : "const long *",
-   "referenced_type" : "_ZTIKl",
-   "self_type" : "_ZTIPKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -39700,6 +39352,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14trust_token_st",
    "name" : "trust_token_st **",
    "referenced_type" : "_ZTIP14trust_token_st",
@@ -40101,7 +39762,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40173,7 +39834,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/bio.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40253,7 +39914,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 480,
+   "size" : 344,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40575,7 +40236,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40595,7 +40256,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 44,
+   "size" : 36,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40995,15 +40656,17 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 76,
+   "size" : 84,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 144,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -41125,22 +40788,12 @@
    "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKl",
-   "name" : "const long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -41393,42 +41046,6 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump"
-    },
-    {
-     "field_name" : "enc_offset",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_AUX_st",
-   "name" : "ASN1_AUX_st",
-   "referenced_type" : "_ZTI11ASN1_AUX_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTI11ASN1_AUX_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "app_data",
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "ref_offset",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "asn1_cb",
-     "field_offset" : 96,
      "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -42578,7 +42195,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42586,7 +42203,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42614,22 +42231,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 5120,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42637,7 +42254,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42930,7 +42547,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIA128_h"
+     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
     },
     {
      "field_name" : "block_used",
@@ -43460,7 +43077,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -43472,7 +43089,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43661,6 +43278,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 288,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 352,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 736,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 768,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 800,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 832,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 864,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 928,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 992,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 20,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPj"
     },
@@ -43941,6 +43801,28 @@
    "source_file" : "external/boringssl/src/include/openssl/kyber.h"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "bytes",
+     "referenced_type" : "_ZTIA128_h"
+    },
+    {
+     "field_name" : "words",
+     "referenced_type" : "_ZTIA16_y"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN16blake2b_state_stUt_E",
+   "name" : "blake2b_state_st::(unnamed)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN16blake2b_state_stUt_E",
+   "self_type" : "_ZTIN16blake2b_state_stUt_E",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 2,
    "fields" :
    [
diff --git a/34/64/arm_arm64/source-based/libcrypto_utils.so.lsdump b/34/64/arm_arm64/source-based/libcrypto_utils.so.lsdump
index a9ad8f02..ea0189ee 100644
--- a/34/64/arm_arm64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcrypto_utils.so.lsdump
@@ -137,11 +137,13 @@
  "qualified_types" :
  [
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 144,
    "source_file" : "system/core/libcrypto_utils/include/crypto_utils/android_pubkey.h"
   },
   {
diff --git a/34/64/arm_arm64/source-based/libcurl.so.lsdump b/34/64/arm_arm64/source-based/libcurl.so.lsdump
index 9f96b7ff..7d0984dc 100644
--- a/34/64/arm_arm64/source-based/libcurl.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcurl.so.lsdump
@@ -112,6 +112,12 @@
    "name" : "Curl_all_content_encodings"
   },
   {
+   "name" : "Curl_alpn_get_proxy_spec"
+  },
+  {
+   "name" : "Curl_alpn_get_spec"
+  },
+  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -202,81 +208,9 @@
    "name" : "Curl_base64url_encode"
   },
   {
-   "name" : "Curl_bufcp_free"
-  },
-  {
-   "name" : "Curl_bufcp_init"
-  },
-  {
-   "name" : "Curl_bufcp_put"
-  },
-  {
-   "name" : "Curl_bufcp_take"
-  },
-  {
    "name" : "Curl_buffer_send"
   },
   {
-   "name" : "Curl_bufq_free"
-  },
-  {
-   "name" : "Curl_bufq_init"
-  },
-  {
-   "name" : "Curl_bufq_init2"
-  },
-  {
-   "name" : "Curl_bufq_initp"
-  },
-  {
-   "name" : "Curl_bufq_is_empty"
-  },
-  {
-   "name" : "Curl_bufq_is_full"
-  },
-  {
-   "name" : "Curl_bufq_len"
-  },
-  {
-   "name" : "Curl_bufq_pass"
-  },
-  {
-   "name" : "Curl_bufq_peek"
-  },
-  {
-   "name" : "Curl_bufq_peek_at"
-  },
-  {
-   "name" : "Curl_bufq_read"
-  },
-  {
-   "name" : "Curl_bufq_reset"
-  },
-  {
-   "name" : "Curl_bufq_sipn"
-  },
-  {
-   "name" : "Curl_bufq_skip"
-  },
-  {
-   "name" : "Curl_bufq_skip_and_shift"
-  },
-  {
-   "name" : "Curl_bufq_slurp"
-  },
-  {
-   "name" : "Curl_bufq_slurpn"
-  },
-  {
-   "name" : "Curl_bufq_space"
-  },
-  {
-   "name" : "Curl_bufq_write"
-  },
-  {
-   "name" : "Curl_bufq_write_pass"
-  },
-  {
    "name" : "Curl_bufref_free"
   },
   {
@@ -346,9 +280,6 @@
    "name" : "Curl_cf_def_send"
   },
   {
-   "name" : "Curl_cf_h1_proxy_insert_after"
-  },
-  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -361,9 +292,6 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
-   "name" : "Curl_cf_http_proxy_get_host"
-  },
-  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -439,13 +367,13 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard_all"
+   "name" : "Curl_conn_cf_discard"
   },
   {
-   "name" : "Curl_conn_cf_discard_chain"
+   "name" : "Curl_conn_cf_discard_all"
   },
   {
-   "name" : "Curl_conn_cf_discard_sub"
+   "name" : "Curl_conn_cf_discard_chain"
   },
   {
    "name" : "Curl_conn_cf_get_select_socks"
@@ -457,9 +385,6 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
-   "name" : "Curl_conn_cf_is_ssl"
-  },
-  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -514,6 +439,9 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
+   "name" : "Curl_conn_http_proxy_add"
+  },
+  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -682,72 +610,6 @@
    "name" : "Curl_dyn_vprintf"
   },
   {
-   "name" : "Curl_dynhds_add"
-  },
-  {
-   "name" : "Curl_dynhds_add_custom"
-  },
-  {
-   "name" : "Curl_dynhds_cadd"
-  },
-  {
-   "name" : "Curl_dynhds_ccontains"
-  },
-  {
-   "name" : "Curl_dynhds_ccount_name"
-  },
-  {
-   "name" : "Curl_dynhds_cget"
-  },
-  {
-   "name" : "Curl_dynhds_contains"
-  },
-  {
-   "name" : "Curl_dynhds_count"
-  },
-  {
-   "name" : "Curl_dynhds_count_name"
-  },
-  {
-   "name" : "Curl_dynhds_cremove"
-  },
-  {
-   "name" : "Curl_dynhds_cset"
-  },
-  {
-   "name" : "Curl_dynhds_free"
-  },
-  {
-   "name" : "Curl_dynhds_get"
-  },
-  {
-   "name" : "Curl_dynhds_getn"
-  },
-  {
-   "name" : "Curl_dynhds_h1_add_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_cadd_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_dprint"
-  },
-  {
-   "name" : "Curl_dynhds_init"
-  },
-  {
-   "name" : "Curl_dynhds_remove"
-  },
-  {
-   "name" : "Curl_dynhds_reset"
-  },
-  {
-   "name" : "Curl_dynhds_set"
-  },
-  {
-   "name" : "Curl_dynhds_set_opts"
-  },
-  {
    "name" : "Curl_expire"
   },
   {
@@ -820,15 +682,6 @@
    "name" : "Curl_gmtime"
   },
   {
-   "name" : "Curl_h1_req_parse_free"
-  },
-  {
-   "name" : "Curl_h1_req_parse_init"
-  },
-  {
-   "name" : "Curl_h1_req_parse_read"
-  },
-  {
    "name" : "Curl_hash_add"
   },
   {
@@ -931,9 +784,6 @@
    "name" : "Curl_http_cookies"
   },
   {
-   "name" : "Curl_http_decode_status"
-  },
-  {
    "name" : "Curl_http_done"
   },
   {
@@ -961,24 +811,6 @@
    "name" : "Curl_http_readwrite_headers"
   },
   {
-   "name" : "Curl_http_req_free"
-  },
-  {
-   "name" : "Curl_http_req_make"
-  },
-  {
-   "name" : "Curl_http_req_make2"
-  },
-  {
-   "name" : "Curl_http_req_to_h2"
-  },
-  {
-   "name" : "Curl_http_resp_free"
-  },
-  {
-   "name" : "Curl_http_resp_make"
-  },
-  {
    "name" : "Curl_http_resume"
   },
   {
@@ -1654,9 +1486,6 @@
    "name" : "Curl_updatesocket"
   },
   {
-   "name" : "Curl_url_set_authority"
-  },
-  {
    "name" : "Curl_urldecode"
   },
   {
@@ -2020,9 +1849,6 @@
    "name" : "Curl_cfree"
   },
   {
-   "name" : "Curl_cft_h1_proxy"
-  },
-  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4430,10 +4256,6 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
-     "enum_field_value" : 3,
-     "name" : "CURLPROXY_HTTPS2"
-    },
-    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/arm_arm64/source-based/libdiskconfig.so.lsdump b/34/64/arm_arm64/source-based/libdiskconfig.so.lsdump
new file mode 100644
index 00000000..d5b31cfe
--- /dev/null
+++ b/34/64/arm_arm64/source-based/libdiskconfig.so.lsdump
@@ -0,0 +1,642 @@
+{
+ "array_types" :
+ [
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA0_h",
+   "name" : "unsigned char[0]",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIA0_h",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA440_h",
+   "name" : "unsigned char[440]",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIA440_h",
+   "size" : 440,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "_ZTIA4_12pc_partition",
+   "name" : "pc_partition[4]",
+   "referenced_type" : "_ZTI12pc_partition",
+   "self_type" : "_ZTIA4_12pc_partition",
+   "size" : 64,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "builtin_types" :
+ [
+  {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIc",
+   "name" : "char",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
+   "size" : 1
+  },
+  {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
+   "alignment" : 4,
+   "is_integral" : true,
+   "linker_set_key" : "_ZTIi",
+   "name" : "int",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
+   "size" : 4
+  },
+  {
+   "alignment" : 4,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIj",
+   "name" : "unsigned int",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
+   "size" : 4
+  },
+  {
+   "alignment" : 2,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIt",
+   "name" : "unsigned short",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
+   "size" : 2
+  },
+  {
+   "linker_set_key" : "_ZTIv",
+   "name" : "void",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
+  },
+  {
+   "alignment" : 8,
+   "is_integral" : true,
+   "linker_set_key" : "_ZTIx",
+   "name" : "long long",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
+   "size" : 8
+  }
+ ],
+ "elf_functions" :
+ [
+  {
+   "name" : "alloc_wl"
+  },
+  {
+   "name" : "apply_disk_config"
+  },
+  {
+   "name" : "config_mbr"
+  },
+  {
+   "name" : "dump_disk_config"
+  },
+  {
+   "name" : "find_mbr_part"
+  },
+  {
+   "name" : "find_part"
+  },
+  {
+   "name" : "find_part_device"
+  },
+  {
+   "name" : "free_wl"
+  },
+  {
+   "name" : "load_diskconfig"
+  },
+  {
+   "name" : "process_disk_config"
+  },
+  {
+   "name" : "wlist_add"
+  },
+  {
+   "name" : "wlist_commit"
+  },
+  {
+   "name" : "wlist_free"
+  },
+  {
+   "name" : "write_raw_image"
+  }
+ ],
+ "elf_objects" : [],
+ "enum_types" : [],
+ "function_types" : [],
+ "functions" :
+ [
+  {
+   "function_name" : "alloc_wl",
+   "linker_set_key" : "alloc_wl",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "apply_disk_config",
+   "linker_set_key" : "apply_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "config_mbr",
+   "linker_set_key" : "config_mbr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "dump_disk_config",
+   "linker_set_key" : "dump_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_mbr_part",
+   "linker_set_key" : "find_mbr_part",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIPc",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_part",
+   "linker_set_key" : "find_part",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIP9part_info",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "find_part_device",
+   "linker_set_key" : "find_part_device",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIPc",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "free_wl",
+   "linker_set_key" : "free_wl",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "load_diskconfig",
+   "linker_set_key" : "load_diskconfig",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    }
+   ],
+   "return_type" : "_ZTIP9disk_info",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "process_disk_config",
+   "linker_set_key" : "process_disk_config",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP9disk_info"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_add",
+   "linker_set_key" : "wlist_add",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPP10write_list"
+    },
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIP10write_list",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_commit",
+   "linker_set_key" : "wlist_commit",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "wlist_free",
+   "linker_set_key" : "wlist_free",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10write_list"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "function_name" : "write_raw_image",
+   "linker_set_key" : "write_raw_image",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "global_vars" : [],
+ "lvalue_reference_types" : [],
+ "pointer_types" :
+ [
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP10write_list",
+   "name" : "write_list *",
+   "referenced_type" : "_ZTI10write_list",
+   "self_type" : "_ZTIP10write_list",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP9disk_info",
+   "name" : "disk_info *",
+   "referenced_type" : "_ZTI9disk_info",
+   "self_type" : "_ZTIP9disk_info",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP9part_info",
+   "name" : "part_info *",
+   "referenced_type" : "_ZTI9part_info",
+   "self_type" : "_ZTIP9part_info",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPKc",
+   "name" : "const char *",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPP10write_list",
+   "name" : "write_list **",
+   "referenced_type" : "_ZTIP10write_list",
+   "self_type" : "_ZTIPP10write_list",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPc",
+   "name" : "char *",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
+   "size" : 4,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "qualified_types" :
+ [
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIKc",
+   "name" : "const char",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
+   "size" : 1,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "record_types" :
+ [
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "next",
+     "referenced_type" : "_ZTIP10write_list"
+    },
+    {
+     "field_name" : "offset",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "field_name" : "len",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIA0_h"
+    }
+   ],
+   "linker_set_key" : "_ZTI10write_list",
+   "name" : "write_list",
+   "referenced_type" : "_ZTI10write_list",
+   "self_type" : "_ZTI10write_list",
+   "size" : 24,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "status",
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "start",
+     "field_offset" : 8,
+     "referenced_type" : "_ZTI3chs"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "end",
+     "field_offset" : 40,
+     "referenced_type" : "_ZTI3chs"
+    },
+    {
+     "field_name" : "start_lba",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "len_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI12pc_partition",
+   "name" : "pc_partition",
+   "referenced_type" : "_ZTI12pc_partition",
+   "self_type" : "_ZTI12pc_partition",
+   "size" : 16,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "code",
+     "referenced_type" : "_ZTIA440_h"
+    },
+    {
+     "field_name" : "disk_sig",
+     "field_offset" : 3520,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "pad",
+     "field_offset" : 3552,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "field_name" : "ptable",
+     "field_offset" : 3568,
+     "referenced_type" : "_ZTIA4_12pc_partition"
+    },
+    {
+     "field_name" : "mbr_sig",
+     "field_offset" : 4080,
+     "referenced_type" : "_ZTIt"
+    }
+   ],
+   "linker_set_key" : "_ZTI14pc_boot_record",
+   "name" : "pc_boot_record",
+   "referenced_type" : "_ZTI14pc_boot_record",
+   "self_type" : "_ZTI14pc_boot_record",
+   "size" : 512,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 1,
+   "fields" :
+   [
+    {
+     "field_name" : "head",
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "sector",
+     "field_offset" : 8,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "cylinder",
+     "field_offset" : 16,
+     "referenced_type" : "_ZTIh"
+    }
+   ],
+   "linker_set_key" : "_ZTI3chs",
+   "name" : "chs",
+   "referenced_type" : "_ZTI3chs",
+   "self_type" : "_ZTI3chs",
+   "size" : 3,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "device",
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "field_name" : "scheme",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "sect_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "skip_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "num_lba",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "part_lst",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9part_info"
+    },
+    {
+     "field_name" : "num_parts",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTI9disk_info",
+   "name" : "disk_info",
+   "referenced_type" : "_ZTI9disk_info",
+   "self_type" : "_ZTI9disk_info",
+   "size" : 28,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 40,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "field_name" : "len_kb",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "start_lba",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI9part_info",
+   "name" : "part_info",
+   "referenced_type" : "_ZTI9part_info",
+   "self_type" : "_ZTI9part_info",
+   "size" : 16,
+   "source_file" : "system/core/libdiskconfig/include/diskconfig/diskconfig.h"
+  }
+ ],
+ "rvalue_reference_types" : []
+}
diff --git a/34/64/arm_arm64/source-based/libdmabufheap.so.lsdump b/34/64/arm_arm64/source-based/libdmabufheap.so.lsdump
index 8042217d..461a47f7 100644
--- a/34/64/arm_arm64/source-based/libdmabufheap.so.lsdump
+++ b/34/64/arm_arm64/source-based/libdmabufheap.so.lsdump
@@ -1502,7 +1502,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1553,7 +1553,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -7839,8 +7839,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7943,8 +7943,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8142,8 +8142,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.34_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.UpsideDownCake_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/34/64/arm_arm64/source-based/libdumpstateutil.so.lsdump b/34/64/arm_arm64/source-based/libdumpstateutil.so.lsdump
index b7871349..b5b80eff 100644
--- a/34/64/arm_arm64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/arm_arm64/source-based/libdumpstateutil.so.lsdump
@@ -153,9 +153,6 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -205,9 +202,6 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -580,12 +574,6 @@
    "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
   },
   {
-   "function_name" : "android::os::dumpstate::PropertiesHelper::IsStrictRun",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv",
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
    "function_name" : "android::os::dumpstate::PropertiesHelper::IsUserBuild",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv",
    "return_type" : "_ZTIb",
@@ -724,13 +712,6 @@
   },
   {
    "access" : "private",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E",
-   "name" : "android::os::dumpstate::PropertiesHelper::strict_run_",
-   "referenced_type" : "_ZTIi",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
-   "access" : "private",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E",
    "name" : "android::os::dumpstate::PropertiesHelper::parallel_run_",
    "referenced_type" : "_ZTIi",
diff --git a/34/64/arm_arm64/source-based/libgralloctypes.so.lsdump b/34/64/arm_arm64/source-based/libgralloctypes.so.lsdump
index dc63f8bd..6162edad 100644
--- a/34/64/arm_arm64/source-based/libgralloctypes.so.lsdump
+++ b/34/64/arm_arm64/source-based/libgralloctypes.so.lsdump
@@ -2877,11 +2877,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3468,11 +3468,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4053,11 +4053,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/arm_arm64/source-based/libhardware.so.lsdump b/34/64/arm_arm64/source-based/libhardware.so.lsdump
index e7be0794..263dbf19 100644
--- a/34/64/arm_arm64/source-based/libhardware.so.lsdump
+++ b/34/64/arm_arm64/source-based/libhardware.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -936,7 +936,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -957,7 +957,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -975,7 +975,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -993,7 +993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "global_vars" : [],
@@ -1007,7 +1007,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1016,7 +1016,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1034,7 +1034,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1061,7 +1061,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1079,7 +1079,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1088,7 +1088,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1119,7 +1119,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1168,7 +1168,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1224,7 +1224,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1415,7 +1415,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/arm_arm64/source-based/libhidlbase.so.lsdump b/34/64/arm_arm64/source-based/libhidlbase.so.lsdump
index 9b7833d4..5c06beed 100644
--- a/34/64/arm_arm64/source-based/libhidlbase.so.lsdump
+++ b/34/64/arm_arm64/source-based/libhidlbase.so.lsdump
@@ -264,6 +264,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -276,6 +284,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -288,6 +300,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -296,11 +312,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
@@ -1874,6 +1890,22 @@
    "name" : "_ZN7android8hardware21writeEmbeddedToParcelERKNS0_11hidl_stringEPNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware22configureRpcThreadpoolEjb"
   },
   {
@@ -1889,6 +1921,22 @@
    "name" : "_ZN7android8hardware22readEmbeddedFromParcelERKNS0_11hidl_stringERKNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE"
   },
   {
@@ -2350,6 +2398,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
   },
   {
@@ -2753,6 +2821,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE18__lookup_classnameIPKcEEtT_S5_bc"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__112regex_traitsIcE19__transform_primaryINS_11__wrap_iterIPcEEEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SC_c"
   },
   {
@@ -2769,6 +2841,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2829,6 +2905,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEERKT_"
   },
   {
@@ -2837,6 +2917,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2845,15 +2929,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
   },
   {
    "binding" : "weak",
@@ -2869,10 +2957,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__parse_BACKREFIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__push_back_refEi"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ORD_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ecma_expIPKcEET_S7_S7_"
   },
   {
@@ -2889,6 +2985,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_simple_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_ERE_branchIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_awk_escapeIPKcEET_S7_S7_PNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -2925,6 +3029,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2969,10 +3077,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE25__parse_pattern_characterIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE26__parse_bracket_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2989,6 +3093,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__parse_one_char_or_coll_elem_EREIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__push_begin_marked_subexpressionEv"
   },
   {
@@ -2997,10 +3105,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE3endEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE5clearEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEE3endEv"
   },
   {
@@ -3009,6 +3129,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112regex_traitsIcE6__initEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -3017,14 +3145,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS_6vectorIPKcNS_9allocatorISA_EEEEEENSB_ISE_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3037,6 +3181,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3045,6 +3193,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE11__read_modeEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE4openEPKcj"
   },
   {
@@ -3097,19 +3253,51 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEEC2EjjS8_"
+   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEEC2EjjSA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEEC2EjjSA_"
+   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIccEERNS_9allocatorIS2_EEEC2EjjS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIccEERNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEEC2EjjS7_"
   },
   {
    "binding" : "weak",
@@ -3117,6 +3305,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchINS_11__wrap_iterIPKcEEEERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_9sub_matchINS_11__wrap_iterIPKcEEEERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_9sub_matchIPKcEERNS_9allocatorIS4_EEEC2EjjS7_"
   },
   {
@@ -3137,6 +3333,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3145,6 +3345,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3153,11 +3357,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
@@ -3165,6 +3369,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -3229,10 +3437,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS1_8hardware9SchedPrioENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_S9_EEEEEixERSE_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEEbNS_4lessIS7_EENS_9allocatorINS_4pairIKS7_bEEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS4_IiEEEENS8_IS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSE_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_4hidl4base4V1_05IBaseEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SH_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_8hardware7IBinderEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SF_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapIPKN7android4hidl4base4V1_05IBaseENS1_2wpINS1_8hardware9BHwBinderEEENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_SB_EEEEEixERSG_"
   },
   {
@@ -3269,18 +3493,70 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISN_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE14__erase_uniqueIS8_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_10unique_ptrINS_11__tree_nodeISB_PvEENS_22__tree_node_destructorINSG_ISV_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE4findIS8_EENS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE5eraseENS_21__tree_const_iteratorISB_PNS_11__tree_nodeISB_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS9_PvEENS_22__tree_node_destructorINSE_IST_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE5eraseENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSP_SP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE25__emplace_unique_key_argsIS7_JS7_SD_EEENS_4pairINS_15__tree_iteratorISE_PNS_11__tree_nodeISE_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3297,6 +3573,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3309,7 +3589,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
@@ -3325,6 +3609,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISE_EEEERSR_SR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -3345,15 +3637,19 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE5eraseENS_21__tree_const_iteratorISD_PNS_11__tree_nodeISD_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
@@ -3369,6 +3665,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3381,6 +3685,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS0_IPKcNS_9allocatorIS9_EEEEEENSA_ISD_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -3389,6 +3697,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIccEENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
   },
   {
@@ -3413,10 +3733,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE6resizeEj"
   },
   {
@@ -3457,10 +3785,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE21__push_back_slow_pathIS1_EEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE21__push_back_slow_pathIRKcEEvOT_"
   },
   {
@@ -3469,6 +3809,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2INS_21__tree_const_iteratorIiPNS_11__tree_nodeIiPvEEiEEEET_NS_9enable_ifIXaasr21__is_forward_iteratorISB_EE5valuesr16is_constructibleIiNS_15iterator_traitsISB_E9referenceEEE5valueESB_E4typeE"
   },
   {
@@ -3477,6 +3825,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3765,6 +4117,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -3796,6 +4152,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -3881,6 +4241,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4028,6 +4392,10 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
+  },
+  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4037,6 +4405,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4046,6 +4418,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4072,6 +4448,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8456,6 +8836,42 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::base::V1_0::IBase>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl4base4V1_05IBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl4base4V1_05IBaseEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_215IServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_",
    "parameters" :
@@ -8504,6 +8920,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_",
    "parameters" :
@@ -8553,6 +8985,22 @@
   },
   {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE",
    "parameters" :
    [
@@ -8585,35 +9033,35 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "function_name" : "android::sp<android::hardware::hidl_binder_death_recipient>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     },
     {
-     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
     },
     {
-     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -16947,6 +17395,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::configureRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware22configureRpcThreadpoolEjb",
    "parameters" :
@@ -17037,6 +17597,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::getOrCreateCachedBinder",
    "linker_set_key" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE",
    "parameters" :
@@ -19051,6 +19723,91 @@
   },
   {
    "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
    "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
    "parameters" :
    [
@@ -21420,8 +22177,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.UpsideDownCake_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.UpsideDownCake_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -22771,7 +23528,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.UpsideDownCake_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/34/64/arm_arm64/source-based/libmedia_helper.so.lsdump b/34/64/arm_arm64/source-based/libmedia_helper.so.lsdump
index ae131fb1..2a372d86 100644
--- a/34/64/arm_arm64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/arm_arm64/source-based/libmedia_helper.so.lsdump
@@ -668,33 +668,21 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10valueHacOnE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
-   "name" : "_ZN7android14AudioParameter11valueHacOffE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
-   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -716,15 +704,6 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -734,9 +713,6 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
-   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1450,24 +1426,12 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10keyTtyModeE",
-   "name" : "android::AudioParameter::keyTtyMode",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter10valueFalseE",
    "name" : "android::AudioParameter::valueFalse",
    "referenced_type" : "_ZTIKPKc",
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10valueHacOnE",
-   "name" : "android::AudioParameter::valueHacOn",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter11keyChannelsE",
    "name" : "android::AudioParameter::keyChannels",
    "referenced_type" : "_ZTIKPKc",
@@ -1480,12 +1444,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter11valueHacOffE",
-   "name" : "android::AudioParameter::valueHacOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter12keyProgramIdE",
    "name" : "android::AudioParameter::keyProgramId",
    "referenced_type" : "_ZTIKPKc",
@@ -1498,12 +1456,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter13keyHacSettingE",
-   "name" : "android::AudioParameter::keyHacSetting",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter13keyMonoOutputE",
    "name" : "android::AudioParameter::keyMonoOutput",
    "referenced_type" : "_ZTIKPKc",
@@ -1546,24 +1498,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeHcoE",
-   "name" : "android::AudioParameter::valueTtyModeHco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeOffE",
-   "name" : "android::AudioParameter::valueTtyModeOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeVcoE",
-   "name" : "android::AudioParameter::valueTtyModeVco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter16keyBtLeSuspendedE",
    "name" : "android::AudioParameter::keyBtLeSuspended",
    "referenced_type" : "_ZTIKPKc",
@@ -1582,12 +1516,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter16valueTtyModeFullE",
-   "name" : "android::AudioParameter::valueTtyModeFull",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter17keyPresentationIdE",
    "name" : "android::AudioParameter::keyPresentationId",
    "referenced_type" : "_ZTIKPKc",
diff --git a/34/64/arm_arm64/source-based/libmedia_omx.so.lsdump b/34/64/arm_arm64/source-based/libmedia_omx.so.lsdump
index 97779e6c..fffef442 100644
--- a/34/64/arm_arm64/source-based/libmedia_omx.so.lsdump
+++ b/34/64/arm_arm64/source-based/libmedia_omx.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5549,7 +5549,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5565,11 +5565,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5578,7 +5578,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5921,7 +5921,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5937,71 +5937,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -7273,10 +7273,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7387,14 +7383,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -10606,11 +10594,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11197,11 +11185,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11782,11 +11770,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12745,7 +12733,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12763,7 +12751,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12796,7 +12784,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12811,7 +12799,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12829,7 +12817,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12847,7 +12835,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12874,7 +12862,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12919,7 +12907,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12937,7 +12925,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12958,7 +12946,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12982,7 +12970,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13018,7 +13006,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13057,7 +13045,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13093,7 +13081,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13132,7 +13120,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13165,7 +13153,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13183,7 +13171,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13219,7 +13207,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13240,7 +13228,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17011,7 +16999,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17020,7 +17008,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17047,7 +17035,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17074,7 +17062,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17101,7 +17089,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17119,7 +17107,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17236,7 +17224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17245,7 +17233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17254,7 +17242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17263,7 +17251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17272,7 +17260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17281,7 +17269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17290,7 +17278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17308,7 +17296,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17317,7 +17305,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17326,7 +17314,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17335,7 +17323,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17344,7 +17332,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17353,7 +17341,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17362,7 +17350,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17371,7 +17359,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17380,7 +17368,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17389,7 +17377,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17407,7 +17395,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17416,7 +17404,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17443,7 +17431,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17461,7 +17449,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18887,15 +18875,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "_ZTIN7android12LightRefBaseINS_5FenceEEE",
-   "self_type" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android12NativeHandleE",
    "name" : "android::NativeHandle *",
    "referenced_type" : "_ZTIN7android12NativeHandleE",
@@ -19004,15 +18983,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "_ZTIN7android19FenceToFenceTimeMapE",
-   "self_type" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -20359,7 +20329,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20386,7 +20356,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20566,7 +20536,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20596,7 +20566,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22371,13 +22341,11 @@
    "source_file" : "frameworks/av/media/libmedia/include/media/MediaCodecBuffer.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
    "name" : "const std::shared_ptr<android::FenceTime>",
    "referenced_type" : "_ZTINSt3__110shared_ptrIN7android9FenceTimeEEE",
    "self_type" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
-   "size" : 8,
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -23185,7 +23153,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23241,7 +23209,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23426,7 +23394,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23570,7 +23538,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23863,7 +23831,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24245,7 +24213,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35364,12 +35332,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43474,15 +43436,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ALooperEEE",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ALooperEEE",
diff --git a/34/64/arm_arm64/source-based/libprocessgroup.so.lsdump b/34/64/arm_arm64/source-based/libprocessgroup.so.lsdump
index 437b7411..7587215c 100644
--- a/34/64/arm_arm64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/arm_arm64/source-based/libprocessgroup.so.lsdump
@@ -146,12 +146,6 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
-   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
-  },
-  {
-   "name" : "_Z24sendSignalToProcessGroupjii"
-  },
-  {
    "name" : "_Z24setProcessGroupSoftLimitjix"
   },
   {
@@ -250,7 +244,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1138,15 +1132,9 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1162,15 +1150,9 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1183,18 +1165,12 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1222,42 +1198,21 @@
    "name" : "_ZNK16ProfileAttribute14GetPathForTaskEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZNK16ProfileAttribute17GetPathForProcessEjiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
-   "name" : "_ZNK16ProfileAttribute9file_nameEv"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction13ExecuteForUIDEj"
   },
   {
    "name" : "_ZNK18SetAttributeAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18SetAttributeAction14IsValidForTaskEi"
-  },
-  {
-   "name" : "_ZNK18SetAttributeAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18SetAttributeAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK19SetTimerSlackAction14ExecuteForTaskEi"
   },
   {
diff --git a/34/64/arm_arm64/source-based/libsqlite.so.lsdump b/34/64/arm_arm64/source-based/libsqlite.so.lsdump
index 4282a1df..4e718747 100644
--- a/34/64/arm_arm64/source-based/libsqlite.so.lsdump
+++ b/34/64/arm_arm64/source-based/libsqlite.so.lsdump
@@ -337,9 +337,6 @@
    "name" : "sqlite3_interrupt"
   },
   {
-   "name" : "sqlite3_is_interrupted"
-  },
-  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -694,9 +691,6 @@
    "name" : "sqlite3_value_dup"
   },
   {
-   "name" : "sqlite3_value_encoding"
-  },
-  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/arm_arm64/source-based/libssl.so.lsdump b/34/64/arm_arm64/source-based/libssl.so.lsdump
index ba49978c..68b05f4d 100644
--- a/34/64/arm_arm64/source-based/libssl.so.lsdump
+++ b/34/64/arm_arm64/source-based/libssl.so.lsdump
@@ -20,15 +20,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA13_22SignatureAlgorithmName",
-   "name" : "SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1424_h",
    "name" : "unsigned char[1424]",
@@ -74,15 +65,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA24_13ssl_cipher_st",
-   "name" : "ssl_cipher_st[24]",
-   "referenced_type" : "_ZTI13ssl_cipher_st",
-   "self_type" : "_ZTIA24_13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA24_h",
    "name" : "unsigned char[24]",
@@ -137,15 +119,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA3_PKc",
-   "name" : "const char *[3]",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIA3_PKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "linker_set_key" : "_ZTIA3_t",
    "name" : "unsigned short[3]",
@@ -192,11 +165,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -227,24 +200,6 @@
    "source_file" : "external/boringssl/src/include/openssl/sha.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl10NamedGroupE",
-   "name" : "bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIN4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl11VersionInfoE",
-   "name" : "bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA7776_h",
    "name" : "unsigned char[7776]",
@@ -557,9 +512,6 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
-   "name" : "SSL_CIPHER_get_handshake_digest"
-  },
-  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -584,6 +536,9 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
+   "name" : "SSL_CIPHER_get_value"
+  },
+  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -848,9 +803,6 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
-   "name" : "SSL_CTX_set1_group_ids"
-  },
-  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1412,24 +1364,6 @@
    "name" : "SSL_get_SSL_CTX"
   },
   {
-   "name" : "SSL_get_all_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_curve_names"
-  },
-  {
-   "name" : "SSL_get_all_group_names"
-  },
-  {
-   "name" : "SSL_get_all_signature_algorithm_names"
-  },
-  {
-   "name" : "SSL_get_all_standard_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_version_names"
-  },
-  {
    "name" : "SSL_get_certificate"
   },
   {
@@ -1490,12 +1424,6 @@
    "name" : "SSL_get_finished"
   },
   {
-   "name" : "SSL_get_group_id"
-  },
-  {
-   "name" : "SSL_get_group_name"
-  },
-  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1517,9 +1445,6 @@
    "name" : "SSL_get_mode"
   },
   {
-   "name" : "SSL_get_negotiated_group"
-  },
-  {
    "name" : "SSL_get_options"
   },
   {
@@ -1790,9 +1715,6 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
-   "name" : "SSL_set1_group_ids"
-  },
-  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2171,9 +2093,6 @@
    "name" : "_ZN4bssl24ssl_cert_check_key_usageEPK6cbs_stNS_15ssl_key_usage_tE"
   },
   {
-   "name" : "_ZN4bssl24ssl_cipher_is_deprecatedEPK13ssl_cipher_st"
-  },
-  {
    "name" : "_ZN4bssl28ssl_is_valid_ech_public_nameENS_4SpanIKhEE"
   },
   {
@@ -6781,18 +6700,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CIPHER_get_handshake_digest",
-   "linker_set_key" : "SSL_CIPHER_get_handshake_digest",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK13ssl_cipher_st"
-    }
-   ],
-   "return_type" : "_ZTIPK9env_md_st",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CIPHER_get_id",
    "linker_set_key" : "SSL_CIPHER_get_id",
    "parameters" :
@@ -6889,6 +6796,18 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CIPHER_get_value",
+   "linker_set_key" : "SSL_CIPHER_get_value",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK13ssl_cipher_st"
+    }
+   ],
+   "return_type" : "_ZTIt",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CIPHER_get_version",
    "linker_set_key" : "SSL_CIPHER_get_version",
    "parameters" :
@@ -8047,24 +7966,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CTX_set1_group_ids",
-   "linker_set_key" : "SSL_CTX_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP10ssl_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CTX_set1_groups",
    "linker_set_key" : "SSL_CTX_set1_groups",
    "parameters" :
@@ -10900,96 +10801,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_all_cipher_names",
-   "linker_set_key" : "SSL_get_all_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_curve_names",
-   "linker_set_key" : "SSL_get_all_curve_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_group_names",
-   "linker_set_key" : "SSL_get_all_group_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_signature_algorithm_names",
-   "linker_set_key" : "SSL_get_all_signature_algorithm_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_standard_cipher_names",
-   "linker_set_key" : "SSL_get_all_standard_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_version_names",
-   "linker_set_key" : "SSL_get_all_version_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_certificate",
    "linker_set_key" : "SSL_get_certificate",
    "parameters" :
@@ -11257,30 +11068,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_group_id",
-   "linker_set_key" : "SSL_get_group_id",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIt",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_group_name",
-   "linker_set_key" : "SSL_get_group_name",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIt"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_info_callback",
    "linker_set_key" : "SSL_get_info_callback",
    "parameters" :
@@ -11374,18 +11161,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_negotiated_group",
-   "linker_set_key" : "SSL_get_negotiated_group",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_options",
    "linker_set_key" : "SSL_get_options",
    "parameters" :
@@ -12643,24 +12418,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_set1_group_ids",
-   "linker_set_key" : "SSL_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP6ssl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_set1_groups",
    "linker_set_key" : "SSL_set1_groups",
    "parameters" :
@@ -14487,15 +14244,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName (&)[13]",
-   "referenced_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "self_type" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA16_Kh",
    "name" : "const unsigned char (&)[16]",
    "referenced_type" : "_ZTIA16_Kh",
@@ -14523,15 +14271,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st (&)[24]",
-   "referenced_type" : "_ZTIA24_K13ssl_cipher_st",
-   "self_type" : "_ZTIRA24_K13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA2_Kh",
    "name" : "const unsigned char (&)[2]",
    "referenced_type" : "_ZTIA2_Kh",
@@ -14577,15 +14316,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_KPKc",
-   "name" : "const char *const (&)[3]",
-   "referenced_type" : "_ZTIA3_KPKc",
-   "self_type" : "_ZTIRA3_KPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA3_Kt",
    "name" : "const unsigned short (&)[3]",
    "referenced_type" : "_ZTIA3_Kt",
@@ -14595,15 +14325,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_PKc",
-   "name" : "const char *(&)[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIRA3_PKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA4_Kh",
    "name" : "const unsigned char (&)[4]",
    "referenced_type" : "_ZTIA4_Kh",
@@ -14622,24 +14343,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA8_Kh",
    "name" : "const unsigned char (&)[8]",
    "referenced_type" : "_ZTIA8_Kh",
@@ -14667,24 +14370,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK13ssl_cipher_st",
-   "name" : "const ssl_cipher_st &",
-   "referenced_type" : "_ZTIK13ssl_cipher_st",
-   "self_type" : "_ZTIRK13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName &",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIRK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRK6cbs_st",
    "name" : "const cbs_st &",
    "referenced_type" : "_ZTIK6cbs_st",
@@ -14694,33 +14379,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup &",
-   "referenced_type" : "_ZTIKN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRKN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo &",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> &",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> &",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -14874,15 +14532,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKPKc",
-   "name" : "const char *const &",
-   "referenced_type" : "_ZTIKPKc",
-   "self_type" : "_ZTIRKPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKh",
    "name" : "const unsigned char &",
    "referenced_type" : "_ZTIKh",
@@ -14973,15 +14622,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRPKc",
-   "name" : "const char *&",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIRPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRh",
    "name" : "unsigned char &",
    "referenced_type" : "_ZTIh",
@@ -15102,6 +14742,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP11rsa_meth_st",
+   "name" : "rsa_meth_st *",
+   "referenced_type" : "_ZTI11rsa_meth_st",
+   "self_type" : "_ZTIP11rsa_meth_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ssl_comp_st",
    "name" : "ssl_comp_st *",
    "referenced_type" : "_ZTI11ssl_comp_st",
@@ -15345,6 +14994,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
    "name" : "bn_mont_ctx_st *",
    "referenced_type" : "_ZTI14bn_mont_ctx_st",
@@ -18567,15 +18225,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName *",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIPK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK22ssl_early_callback_ctx",
    "name" : "const ssl_early_callback_ctx *",
    "referenced_type" : "_ZTIK22ssl_early_callback_ctx",
@@ -18819,15 +18468,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo *",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIPKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIK13ssl_cipher_stEE",
    "name" : "const bssl::Span<const ssl_cipher_st> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIK13ssl_cipher_stEE",
@@ -18837,15 +18477,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -18855,24 +18486,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKbEE",
@@ -18918,15 +18531,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -19503,15 +19107,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -19521,24 +19116,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKbEE",
    "name" : "bssl::Span<const bool> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -19584,15 +19161,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIhEE",
    "name" : "bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -19755,6 +19323,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14ssl_session_st",
    "name" : "ssl_session_st **",
    "referenced_type" : "_ZTIP14ssl_session_st",
@@ -19787,7 +19364,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19823,7 +19400,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -19893,16 +19470,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA16_Kh",
@@ -19933,16 +19500,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st[24]",
-   "referenced_type" : "_ZTIA24_13ssl_cipher_st",
-   "self_type" : "_ZTIA24_K13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA2_Kh",
@@ -19983,16 +19540,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA3_KPKc",
-   "name" : "const char *const[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIA3_KPKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "_ZTIA3_Kt",
@@ -20023,26 +19570,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA8_Kh",
@@ -20343,7 +19870,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20669,16 +20196,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIK22SignatureAlgorithmName",
-   "size" : 26,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK22ssl_early_callback_ctx",
@@ -20851,11 +20368,13 @@
    "source_file" : "external/boringssl/src/include/openssl/bytestring.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 144,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -20907,17 +20426,7 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 72,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIKN4bssl11VersionInfoE",
-   "size" : 8,
+   "size" : 32,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20933,16 +20442,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName>",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup>",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -20953,26 +20452,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool>",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -21023,16 +20502,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *>",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char>",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -21077,7 +20546,7 @@
    "name" : "const bssl::internal::StackAllocated<evp_aead_ctx_st, void, &EVP_AEAD_CTX_zero, &EVP_AEAD_CTX_cleanup>",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIKN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22866,7 +22335,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22874,7 +22343,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22902,22 +22371,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4928,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 5120,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22925,7 +22394,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23691,7 +23160,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -23703,7 +23172,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -24030,6 +23499,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 288,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 352,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 736,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 768,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 800,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 832,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 864,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 928,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 992,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 20,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPj"
     },
@@ -24438,41 +24150,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPK22SignatureAlgorithmName"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE"
     }
    ],
@@ -24508,76 +24185,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKN4bssl11VersionInfoE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKbEE"
     }
    ],
@@ -24753,41 +24360,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKhEE"
     }
    ],
@@ -26473,7 +26045,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26496,7 +26068,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
-   "size" : 704,
+   "size" : 720,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26761,20 +26333,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::internal::SpanBase<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE",
    "name" : "bssl::internal::SpanBase<const bssl::NamedGroup>",
    "record_kind" : "class",
@@ -26789,34 +26347,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "name" : "bssl::internal::SpanBase<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "name" : "bssl::internal::SpanBase<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKbEE",
    "name" : "bssl::internal::SpanBase<const bool>",
    "record_kind" : "class",
diff --git a/34/64/arm_arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/arm_arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 95490f4b..3e99ca8c 100644
--- a/34/64/arm_arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/34/64/arm_arm64/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -5435,7 +5435,7 @@
    "name" : "const android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIKN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -5465,7 +5465,7 @@
    "name" : "const android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIKN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6718,19 +6718,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6821,19 +6815,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9096,7 +9084,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9115,7 +9103,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/arm_arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/arm_arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 1e7b46a2..47399194 100644
--- a/34/64/arm_arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/arm_arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -983,9 +983,6 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
-   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -8095,10 +8092,6 @@
     },
     {
      "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
-    },
-    {
-     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -8451,10 +8444,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -8565,14 +8554,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -11701,11 +11682,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12292,11 +12273,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12877,11 +12858,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14474,37 +14455,6 @@
   },
   {
    "function_name" : "android::GraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android19GraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_16ComponentWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::GraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy",
    "parameters" :
    [
diff --git a/34/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump b/34/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump
index 02b8ac64..80f10bac 100644
--- a/34/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump
+++ b/34/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump
@@ -24051,7 +24051,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv8-a_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv8-a_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -24093,13 +24093,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv8-a_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv8-a_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv8-a_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_arm_armv8-a_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/34/64/arm_arm64/source-based/libstagefright_omx.so.lsdump b/34/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
index e9fdab92..9e2c47c0 100644
--- a/34/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
@@ -643,9 +643,6 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
-   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -8762,10 +8759,6 @@
     },
     {
      "enum_field_value" : 10,
-     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
-    },
-    {
-     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -9118,10 +9111,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -9232,14 +9221,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -15372,37 +15353,6 @@
   },
   {
    "function_name" : "android::OmxGraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android22OmxGraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_15IOmxNodeWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::OmxGraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy",
    "parameters" :
    [
@@ -43282,15 +43232,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ABufferEEE",
    "name" : "android::sp<android::ABuffer> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ABufferEEE",
diff --git a/34/64/arm_arm64/source-based/libstagefright_omx_utils.so.lsdump b/34/64/arm_arm64/source-based/libstagefright_omx_utils.so.lsdump
index c6dec2f7..cc25fa30 100644
--- a/34/64/arm_arm64/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libstagefright_omx_utils.so.lsdump
@@ -7259,10 +7259,6 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
-     "enum_field_value" : 10,
-     "name" : "android::ColorAspects::StandardDisplayP3"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7373,14 +7369,6 @@
      "name" : "android::ColorAspects::PrimariesBT2020"
     },
     {
-     "enum_field_value" : 7,
-     "name" : "android::ColorAspects::PrimariesRP431"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::ColorAspects::PrimariesEG432"
-    },
-    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::PrimariesOther"
     }
@@ -9854,11 +9842,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24586,12 +24574,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/arm_arm64/source-based/libtinyalsa.so.lsdump b/34/64/arm_arm64/source-based/libtinyalsa.so.lsdump
index 1480e65f..af0870a6 100644
--- a/34/64/arm_arm64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/arm_arm64/source-based/libtinyalsa.so.lsdump
@@ -219,9 +219,6 @@
    "name" : "pcm_get_subdevice"
   },
   {
-   "name" : "pcm_get_xruns"
-  },
-  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1302,18 +1299,6 @@
    "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
   },
   {
-   "function_name" : "pcm_get_xruns",
-   "linker_set_key" : "pcm_get_xruns",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP3pcm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
-  },
-  {
    "function_name" : "pcm_ioctl",
    "linker_set_key" : "pcm_ioctl",
    "parameters" :
diff --git a/34/64/arm_arm64/source-based/libui.so.lsdump b/34/64/arm_arm64/source-based/libui.so.lsdump
index 955d6e9e..dca11b4a 100644
--- a/34/64/arm_arm64/source-based/libui.so.lsdump
+++ b/34/64/arm_arm64/source-based/libui.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -860,6 +860,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -868,10 +872,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1202,10 +1214,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1446,6 +1454,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1454,9 +1466,21 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS9_8hidl_vecIhEEPT_ESS_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS8_20StandardMetadataTypeEPFiRKNSD_8hidl_vecIhEEPT_ESR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIjEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIyEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper18validateBufferSizeEPK13native_handlejjijyj"
   },
   {
@@ -1484,6 +1508,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1500,6 +1528,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1519,6 +1551,10 @@
    "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalIN4aidl7android8hardware8graphics6common9Smpte2086EEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSO_PNSE_8hidl_vecIhEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSM_PNSC_8hidl_vecIhEEE"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper4lockEPK13native_handleyRKNS_4RectEiP13android_ycbcr"
   },
   {
@@ -2307,6 +2343,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE14__erase_uniqueIS4_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE25__emplace_unique_key_argsIS4_JRKNS_21piecewise_construct_tENS_5tupleIJOS4_EEENSR_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeISC_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -2335,6 +2375,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2343,15 +2387,31 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113unordered_mapIPN7android5FenceENS_6vectorINS_8weak_ptrINS1_9FenceTimeEEENS_9allocatorIS7_EEEENS_4hashIS3_EENS_8equal_toIS3_EENS8_INS_4pairIKS3_SA_EEEEEixEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -2359,6 +2419,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS4_EEEC2EjjS7_"
   },
   {
@@ -2387,6 +2455,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2435,14 +2507,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEEC2Ej"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware6common12NativeHandleENS_9allocatorIS5_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
@@ -2455,10 +2543,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE6assignIPS6_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS6_NS_15iterator_traitsISD_E9referenceEEE5valueEvE4typeESD_SD_"
   },
   {
@@ -2467,11 +2571,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
@@ -2487,6 +2595,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EEPS2_"
   },
   {
@@ -2507,6 +2619,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEEC2Ej"
   },
   {
@@ -2515,6 +2635,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
   },
   {
@@ -2523,6 +2647,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5eraseENS_11__wrap_iterIPKS4_EESB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE6resizeEj"
   },
   {
@@ -2535,10 +2667,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPKhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS8_E9referenceEEE5valueEvE4typeES8_S8_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
   },
   {
@@ -2547,6 +2695,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
@@ -3872,7 +4032,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -3888,11 +4048,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -3901,7 +4061,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4093,7 +4253,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4109,71 +4269,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4493,7 +4653,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4501,7 +4661,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7263,7 +7423,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8245,11 +8405,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8836,11 +8996,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9421,11 +9581,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10737,7 +10897,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10755,7 +10915,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10788,7 +10948,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10803,7 +10963,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10821,7 +10981,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10839,7 +10999,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10866,7 +11026,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10911,7 +11071,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10929,7 +11089,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10950,7 +11110,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10974,7 +11134,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11010,7 +11170,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11049,7 +11209,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11085,7 +11245,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11124,7 +11284,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11157,7 +11317,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11175,7 +11335,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11211,7 +11371,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11232,7 +11392,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14378,6 +14538,19 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/PublicFormat.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::clear",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_5FenceEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::Fence>::~sp",
    "linker_set_key" : "_ZN7android2spINS_5FenceEED2Ev",
    "parameters" :
@@ -14407,6 +14580,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_",
    "parameters" :
@@ -14423,6 +14612,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V4_0::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_",
    "parameters" :
@@ -16105,12 +16310,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
@@ -22028,7 +22227,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22037,7 +22236,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22082,7 +22281,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22118,7 +22317,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22127,7 +22326,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22217,7 +22416,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22226,7 +22425,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22235,7 +22434,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22244,7 +22443,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22253,7 +22452,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22262,7 +22461,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22271,7 +22470,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22289,7 +22488,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22298,7 +22497,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22307,7 +22506,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22316,7 +22515,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22325,7 +22524,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22334,7 +22533,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22343,7 +22542,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22352,7 +22551,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22361,7 +22560,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22370,7 +22569,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22388,7 +22587,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22397,7 +22596,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22424,7 +22623,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22451,7 +22650,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25376,7 +25575,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25507,7 +25706,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25545,7 +25744,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28082,7 +28281,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28138,7 +28337,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28302,7 +28501,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28399,7 +28598,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28558,7 +28757,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28746,7 +28945,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/arm_arm64/source-based/libunwindstack.so.lsdump b/34/64/arm_arm64/source-based/libunwindstack.so.lsdump
index 913d8c14..d0c11764 100644
--- a/34/64/arm_arm64/source-based/libunwindstack.so.lsdump
+++ b/34/64/arm_arm64/source-based/libunwindstack.so.lsdump
@@ -101,6 +101,24 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextRiscv64.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIA45_j",
+   "name" : "unsigned int[45]",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIA45_j",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA45_y",
+   "name" : "unsigned long long[45]",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIA45_y",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA64_y",
    "name" : "unsigned long long[64]",
@@ -227,379 +245,412 @@
  "elf_functions" :
  [
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
+   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
+   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
+   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_GetGR"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetGR"
   },
   {
-   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetIP"
   },
   {
-   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind17__Unwind_GetIPInfo"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_GetGR"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetGR"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetIP"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind17__Unwind_GetIPInfo"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
+   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
-   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
   },
   {
-   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
+   "name" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips645CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C2Ev"
   },
   {
    "name" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE"
@@ -2490,6 +2541,45 @@
    "name" : "_ZN11unwindstack8MemoryXzD2Ev"
   },
   {
+   "name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips5CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC2Ev"
+  },
+  {
    "name" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy"
   },
   {
@@ -3242,13 +3332,10 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
-  },
-  {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
   },
   {
    "binding" : "weak",
@@ -3317,6 +3404,9 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
+   "name" : "_ZTVN11unwindstack10RegsMips64E"
+  },
+  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3508,6 +3598,9 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
+   "name" : "_ZTVN11unwindstack8RegsMipsE"
+  },
+  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3571,9 +3664,6 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
-  },
-  {
-   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3745,6 +3835,48 @@
    "underlying_type" : "_ZTIy"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS32_EF_R0"
+    },
+    {
+     "enum_field_value" : 40,
+     "name" : "unwindstack::MIPS32_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "name" : "unwindstack::Mips32UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_EF_R0"
+    },
+    {
+     "enum_field_value" : 34,
+     "name" : "unwindstack::MIPS64_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "name" : "unwindstack::Mips64UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4075,6 +4207,163 @@
    "underlying_type" : "_ZTIt"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack7MipsRegE",
+   "name" : "unwindstack::MipsReg",
+   "referenced_type" : "_ZTIN11unwindstack7MipsRegE",
+   "self_type" : "_ZTIN11unwindstack7MipsRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4100,6 +4389,14 @@
     },
     {
      "enum_field_value" : 5,
+     "name" : "unwindstack::ARCH_MIPS"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::ARCH_MIPS64"
+    },
+    {
+     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4367,6 +4664,163 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS64_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS64_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS64_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS64_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS64_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS64_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS64_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS64_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS64_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS64_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS64_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS64_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS64_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS64_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS64_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS64_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS64_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS64_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS64_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS64_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS64_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS64_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS64_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS64_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS64_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS64_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS64_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS64_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS64_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS64_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS64_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack9Mips64RegE",
+   "name" : "unwindstack::Mips64Reg",
+   "referenced_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "self_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "unwindstack::X86_64_REG_RAX"
     },
     {
@@ -4472,6 +4926,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/Maps.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips64::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Arch",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Read",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Clone",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips645CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
    "function_name" : "unwindstack::RegsX86_64::SetFromUcontext",
    "linker_set_key" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE",
    "parameters" :
@@ -7203,6 +7845,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsX86.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Arch",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Read",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Clone",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips5CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "unwindstack::Unwinder::FillInFrame",
    "linker_set_key" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy",
@@ -8135,6 +8965,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64 *",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIPN11unwindstack10RegsMips64E",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64 *",
    "referenced_type" : "_ZTIN11unwindstack10RegsX86_64E",
@@ -8495,6 +9334,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips *",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIPN11unwindstack8RegsMipsE",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack8UnwinderE",
    "name" : "unwindstack::Unwinder *",
    "referenced_type" : "_ZTIN11unwindstack8UnwinderE",
@@ -9011,6 +9859,82 @@
      "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
     }
    ],
+   "linker_set_key" : "_ZTIN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "size" : 40,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack10RegsMips64E"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips644ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplIyE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_pcEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_spEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEty"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips645CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
+    }
+   ],
    "linker_set_key" : "_ZTIN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64",
    "record_kind" : "class",
@@ -9328,6 +10252,12 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__18iteratorINS_26bidirectional_iterator_tagEPN11unwindstack8DwarfFdeEiPS4_RS4_EE"
+    }
+   ],
    "fields" :
    [
     {
@@ -9734,6 +10664,32 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/SharedString.h"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_size",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack12mips_stack_tE",
+   "name" : "unwindstack::mips_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "self_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "size" : 12,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
@@ -10080,6 +11036,48 @@
      "referenced_type" : "_ZTIy"
     },
     {
+     "field_name" : "ss_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "name" : "unwindstack::mips64_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "self_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "size" : 24,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_j"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips_user_regsE",
+   "name" : "unwindstack::mips_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "self_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIy"
+    },
+    {
      "field_name" : "ss_flags",
      "field_offset" : 64,
      "referenced_type" : "_ZTIi"
@@ -10473,6 +11471,68 @@
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sc_regmask",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_status",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_regs",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIA32_y"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "name" : "unwindstack::mips_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "size" : 272,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "name" : "unwindstack::mips_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "size" : 296,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -10875,6 +11935,22 @@
    "fields" :
    [
     {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_y"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "name" : "unwindstack::mips64_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "self_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIy"
     }
@@ -11037,6 +12113,103 @@
    "fields" :
    [
     {
+     "field_name" : "sc_regs",
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_fpregs",
+     "field_offset" : 2048,
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_mdhi",
+     "field_offset" : 4096,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi1",
+     "field_offset" : 4160,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi2",
+     "field_offset" : 4224,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi3",
+     "field_offset" : 4288,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_mdlo",
+     "field_offset" : 4352,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo1",
+     "field_offset" : 4416,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo2",
+     "field_offset" : 4480,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo3",
+     "field_offset" : 4544,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 4608,
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "name" : "unwindstack::mips64_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "size" : 584,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "name" : "unwindstack::mips64_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "size" : 624,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "regs",
      "referenced_type" : "_ZTIA32_y"
     }
@@ -12620,6 +13793,82 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplIjEE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "size" : 40,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack8RegsMipsE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips4ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplIjE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_pcEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_spEy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEty"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPy"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips5CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
diff --git a/34/64/arm_arm64/source-based/libutils.so.lsdump b/34/64/arm_arm64/source-based/libutils.so.lsdump
index f7476d51..73ceb4e8 100644
--- a/34/64/arm_arm64/source-based/libutils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libutils.so.lsdump
@@ -493,6 +493,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -504,6 +508,10 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
+  },
+  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -738,6 +746,9 @@
    "name" : "_ZN7android7String813appendFormatVEPKcSt9__va_list"
   },
   {
+   "name" : "_ZN7android7String816convertToResPathEv"
+  },
+  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1216,6 +1227,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1240,6 +1255,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueIyEEjRKT_"
   },
   {
@@ -1252,6 +1271,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE4findIyEENS_15__hash_iteratorIPNS_11__hash_nodeIS5_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS5_PvEEEE"
   },
   {
@@ -5741,6 +5764,19 @@
    "source_file" : "system/core/libutils/include/utils/misc.h"
   },
   {
+   "function_name" : "android::sp<android::LooperCallback>::clear",
+   "linker_set_key" : "_ZN7android2spINS_14LooperCallbackEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14LooperCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::SimpleLooperCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_",
    "parameters" :
@@ -5786,6 +5822,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::Thread>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6ThreadEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6ThreadEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6ThreadEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6ThreadEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::LightRefBase_reportIncStrongRequireStrongFailed",
    "linker_set_key" : "_ZN7android47LightRefBase_reportIncStrongRequireStrongFailedEPKv",
    "parameters" :
@@ -7016,6 +7068,19 @@
    "source_file" : "system/core/libutils/include/utils/String8.h"
   },
   {
+   "function_name" : "android::String8::convertToResPath",
+   "linker_set_key" : "_ZN7android7String816convertToResPathEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android7String8E"
+    }
+   ],
+   "return_type" : "_ZTIRN7android7String8E",
+   "source_file" : "system/core/libutils/include/utils/String8.h"
+  },
+  {
    "function_name" : "android::String8::clear",
    "linker_set_key" : "_ZN7android7String85clearEv",
    "parameters" :
diff --git a/34/64/arm_arm64/source-based/libxml2.so.lsdump b/34/64/arm_arm64/source-based/libxml2.so.lsdump
index e54cd233..95087cac 100644
--- a/34/64/arm_arm64/source-based/libxml2.so.lsdump
+++ b/34/64/arm_arm64/source-based/libxml2.so.lsdump
@@ -719,9 +719,6 @@
    "name" : "xmlCtxtResetPush"
   },
   {
-   "name" : "xmlCtxtSetMaxAmplification"
-  },
-  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1406,9 +1403,6 @@
    "name" : "xmlMemShow"
   },
   {
-   "name" : "xmlMemSize"
-  },
-  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1922,9 +1916,6 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
-   "name" : "xmlParserInputBufferCreateString"
-  },
-  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3011,9 +3002,6 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
-   "name" : "xmlTextReaderSetMaxAmplification"
-  },
-  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5402,43 +5390,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "XML_ENC_ERR_SUCCESS"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "XML_ENC_ERR_SPACE"
-    },
-    {
-     "enum_field_value" : -2,
-     "name" : "XML_ENC_ERR_INPUT"
-    },
-    {
-     "enum_field_value" : -3,
-     "name" : "XML_ENC_ERR_PARTIAL"
-    },
-    {
-     "enum_field_value" : -4,
-     "name" : "XML_ENC_ERR_INTERNAL"
-    },
-    {
-     "enum_field_value" : -5,
-     "name" : "XML_ENC_ERR_MEMORY"
-    }
-   ],
-   "linker_set_key" : "_ZTI15xmlCharEncError",
-   "name" : "xmlCharEncError",
-   "referenced_type" : "_ZTI15xmlCharEncError",
-   "self_type" : "_ZTI15xmlCharEncError",
-   "size" : 4,
-   "source_file" : "external/libxml2/include/libxml/encoding.h",
-   "underlying_type" : "_ZTIi"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : -1,
      "name" : "XML_CHAR_ENCODING_ERROR"
     },
@@ -6021,10 +5972,6 @@
      "name" : "XML_ERR_COMMENT_ABRUPTLY_ENDED"
     },
     {
-     "enum_field_value" : 113,
-     "name" : "XML_WAR_ENCODING_MISMATCH"
-    },
-    {
      "enum_field_value" : 200,
      "name" : "XML_NS_ERR_XML_NAMESPACE"
     },
@@ -9544,10 +9491,6 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -14028,21 +13971,6 @@
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
-   "function_name" : "xmlCtxtSetMaxAmplification",
-   "linker_set_key" : "xmlCtxtSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlParserCtxt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/parser.h"
-  },
-  {
    "function_name" : "xmlCtxtUseOptions",
    "linker_set_key" : "xmlCtxtUseOptions",
    "parameters" :
@@ -17292,18 +17220,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
   },
   {
-   "function_name" : "xmlMemSize",
-   "linker_set_key" : "xmlMemSize",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
-  },
-  {
    "function_name" : "xmlMemStrdupLoc",
    "linker_set_key" : "xmlMemStrdupLoc",
    "parameters" :
@@ -19827,18 +19743,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlIO.h"
   },
   {
-   "function_name" : "xmlParserInputBufferCreateString",
-   "linker_set_key" : "xmlParserInputBufferCreateString",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    }
-   ],
-   "return_type" : "_ZTIP21_xmlParserInputBuffer",
-   "source_file" : "external/libxml2/include/private/io.h"
-  },
-  {
    "function_name" : "xmlParserInputBufferGrow",
    "linker_set_key" : "xmlParserInputBufferGrow",
    "parameters" :
@@ -22715,7 +22619,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25503,21 +25407,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlreader.h"
   },
   {
-   "function_name" : "xmlTextReaderSetMaxAmplification",
-   "linker_set_key" : "xmlTextReaderSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlTextReader"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/xmlreader.h"
-  },
-  {
    "function_name" : "xmlTextReaderSetParserProp",
    "linker_set_key" : "xmlTextReaderSetParserProp",
    "parameters" :
@@ -35401,18 +35290,13 @@
      "field_name" : "nbWarnings",
      "field_offset" : 3824,
      "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "maxAmpl",
-     "field_offset" : 3840,
-     "referenced_type" : "_ZTIj"
     }
    ],
    "linker_set_key" : "_ZTI14_xmlParserCtxt",
    "name" : "_xmlParserCtxt",
    "referenced_type" : "_ZTI14_xmlParserCtxt",
    "self_type" : "_ZTI14_xmlParserCtxt",
-   "size" : 484,
+   "size" : 480,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -36096,7 +35980,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "flags",
+     "field_name" : "standalone",
      "field_offset" : 416,
      "referenced_type" : "_ZTIi"
     },
diff --git a/34/64/arm_arm64/source-based/libyuv.so.lsdump b/34/64/arm_arm64/source-based/libyuv.so.lsdump
index 95b97f04..ae873e6c 100644
--- a/34/64/arm_arm64/source-based/libyuv.so.lsdump
+++ b/34/64/arm_arm64/source-based/libyuv.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -131,30 +131,12 @@
    "name" : "ABGRToI420"
   },
   {
-   "name" : "ABGRToJ400"
-  },
-  {
-   "name" : "ABGRToJ420"
-  },
-  {
-   "name" : "ABGRToJ422"
-  },
-  {
    "name" : "ABGRToNV12"
   },
   {
    "name" : "ABGRToNV21"
   },
   {
-   "name" : "ABGRToUVJRow_Any_NEON"
-  },
-  {
-   "name" : "ABGRToUVJRow_C"
-  },
-  {
-   "name" : "ABGRToUVJRow_NEON"
-  },
-  {
    "name" : "ABGRToUVRow_Any_NEON"
   },
   {
@@ -164,15 +146,6 @@
    "name" : "ABGRToUVRow_NEON"
   },
   {
-   "name" : "ABGRToYJRow_Any_NEON"
-  },
-  {
-   "name" : "ABGRToYJRow_C"
-  },
-  {
-   "name" : "ABGRToYJRow_NEON"
-  },
-  {
    "name" : "ABGRToYRow_Any_NEON"
   },
   {
@@ -572,9 +545,6 @@
    "name" : "ARGBToI420"
   },
   {
-   "name" : "ARGBToI420Alpha"
-  },
-  {
    "name" : "ARGBToI422"
   },
   {
@@ -881,18 +851,6 @@
    "name" : "DetilePlane"
   },
   {
-   "name" : "DetilePlane_16"
-  },
-  {
-   "name" : "DetileRow_16_Any_NEON"
-  },
-  {
-   "name" : "DetileRow_16_C"
-  },
-  {
-   "name" : "DetileRow_16_NEON"
-  },
-  {
    "name" : "DetileRow_Any_NEON"
   },
   {
@@ -914,18 +872,6 @@
    "name" : "DetileSplitUVRow_NEON"
   },
   {
-   "name" : "DetileToYUY2"
-  },
-  {
-   "name" : "DetileToYUY2_Any_NEON"
-  },
-  {
-   "name" : "DetileToYUY2_C"
-  },
-  {
-   "name" : "DetileToYUY2_NEON"
-  },
-  {
    "name" : "DivideRow_16_Any_NEON"
   },
   {
@@ -1070,9 +1016,6 @@
    "name" : "I010Copy"
   },
   {
-   "name" : "I010Rotate"
-  },
-  {
    "name" : "I010ToAB30"
   },
   {
@@ -1130,9 +1073,6 @@
    "name" : "I210Copy"
   },
   {
-   "name" : "I210Rotate"
-  },
-  {
    "name" : "I210ToAB30"
   },
   {
@@ -1184,9 +1124,6 @@
    "name" : "I212ToARGBRow_C"
   },
   {
-   "name" : "I212ToI420"
-  },
-  {
    "name" : "I212ToI422"
   },
   {
@@ -1229,12 +1166,6 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
-   "name" : "I410Copy"
-  },
-  {
-   "name" : "I410Rotate"
-  },
-  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1250,15 +1181,9 @@
    "name" : "I410ToI010"
   },
   {
-   "name" : "I410ToI420"
-  },
-  {
    "name" : "I410ToI444"
   },
   {
-   "name" : "I412ToI420"
-  },
-  {
    "name" : "I412ToI444"
   },
   {
@@ -1367,9 +1292,6 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
-   "name" : "I420ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1484,18 +1406,6 @@
    "name" : "I422ToNV21"
   },
   {
-   "name" : "I422ToRAW"
-  },
-  {
-   "name" : "I422ToRGB24"
-  },
-  {
-   "name" : "I422ToRGB24Matrix"
-  },
-  {
-   "name" : "I422ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I422ToRGB24Row_Any_NEON"
   },
   {
@@ -1508,9 +1418,6 @@
    "name" : "I422ToRGB565"
   },
   {
-   "name" : "I422ToRGB565Matrix"
-  },
-  {
    "name" : "I422ToRGB565Row_Any_NEON"
   },
   {
@@ -1619,24 +1526,6 @@
    "name" : "I444ToNV21"
   },
   {
-   "name" : "I444ToRAW"
-  },
-  {
-   "name" : "I444ToRGB24"
-  },
-  {
-   "name" : "I444ToRGB24Matrix"
-  },
-  {
-   "name" : "I444ToRGB24Row_Any_NEON"
-  },
-  {
-   "name" : "I444ToRGB24Row_C"
-  },
-  {
-   "name" : "I444ToRGB24Row_NEON"
-  },
-  {
    "name" : "InitCpuFlags"
   },
   {
@@ -1727,12 +1616,6 @@
    "name" : "MM21ToNV12"
   },
   {
-   "name" : "MM21ToYUY2"
-  },
-  {
-   "name" : "MT2TToP010"
-  },
-  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -1763,6 +1646,12 @@
    "name" : "MergeARGBPlane"
   },
   {
+   "name" : "MergeARGBPlaneAlpha"
+  },
+  {
+   "name" : "MergeARGBPlaneOpaque"
+  },
+  {
    "name" : "MergeARGBRow_Any_NEON"
   },
   {
@@ -1856,9 +1745,6 @@
    "name" : "MirrorPlane"
   },
   {
-   "name" : "MirrorRow_16_C"
-  },
-  {
    "name" : "MirrorRow_Any_NEON"
   },
   {
@@ -2036,15 +1922,9 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
-   "name" : "P010ToI010"
-  },
-  {
    "name" : "P010ToP410"
   },
   {
-   "name" : "P012ToI012"
-  },
-  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2315,9 +2195,6 @@
    "name" : "RGBToYMatrixRow_NEON"
   },
   {
-   "name" : "RiscvCpuCaps"
-  },
-  {
    "name" : "RotatePlane"
   },
   {
@@ -2330,9 +2207,6 @@
    "name" : "RotatePlane90"
   },
   {
-   "name" : "RotatePlane_16"
-  },
-  {
    "name" : "Scale"
   },
   {
@@ -2474,9 +2348,6 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
-   "name" : "ScalePlaneDown2_16To8"
-  },
-  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2510,12 +2381,6 @@
    "name" : "ScalePlane_16"
   },
   {
-   "name" : "ScaleRowDown2Box_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Box_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2534,12 +2399,6 @@
    "name" : "ScaleRowDown2Box_Odd_NEON"
   },
   {
-   "name" : "ScaleRowDown2Linear_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2552,12 +2411,6 @@
    "name" : "ScaleRowDown2Linear_NEON"
   },
   {
-   "name" : "ScaleRowDown2_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -2774,24 +2627,12 @@
    "name" : "ScaleUVRowDown2Box_NEON"
   },
   {
-   "name" : "ScaleUVRowDown2Linear_Any_NEON"
-  },
-  {
    "name" : "ScaleUVRowDown2Linear_C"
   },
   {
-   "name" : "ScaleUVRowDown2Linear_NEON"
-  },
-  {
-   "name" : "ScaleUVRowDown2_Any_NEON"
-  },
-  {
    "name" : "ScaleUVRowDown2_C"
   },
   {
-   "name" : "ScaleUVRowDown2_NEON"
-  },
-  {
    "name" : "ScaleUVRowDownEvenBox_C"
   },
   {
@@ -2906,6 +2747,12 @@
    "name" : "SplitARGBPlane"
   },
   {
+   "name" : "SplitARGBPlaneAlpha"
+  },
+  {
+   "name" : "SplitARGBPlaneOpaque"
+  },
+  {
    "name" : "SplitARGBRow_Any_NEON"
   },
   {
@@ -2996,21 +2843,9 @@
    "name" : "SwapUVRow_NEON"
   },
   {
-   "name" : "Transpose4x4_32_C"
-  },
-  {
-   "name" : "Transpose4x4_32_NEON"
-  },
-  {
    "name" : "TransposePlane"
   },
   {
-   "name" : "TransposePlane_16"
-  },
-  {
-   "name" : "TransposeUVWx8_16_C"
-  },
-  {
    "name" : "TransposeUVWx8_Any_NEON"
   },
   {
@@ -3023,9 +2858,6 @@
    "name" : "TransposeUVWxH_C"
   },
   {
-   "name" : "TransposeWx8_16_C"
-  },
-  {
    "name" : "TransposeWx8_Any_NEON"
   },
   {
@@ -3035,9 +2867,6 @@
    "name" : "TransposeWx8_NEON"
   },
   {
-   "name" : "TransposeWxH_16_C"
-  },
-  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3140,12 +2969,6 @@
    "name" : "UYVYToYRow_NEON"
   },
   {
-   "name" : "UnpackMT2T_C"
-  },
-  {
-   "name" : "UnpackMT2T_NEON"
-  },
-  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3173,15 +2996,6 @@
    "name" : "YUY2ToNV12"
   },
   {
-   "name" : "YUY2ToNVUVRow_Any_NEON"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_C"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_NEON"
-  },
-  {
    "name" : "YUY2ToUV422Row_Any_NEON"
   },
   {
@@ -3405,7 +3219,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3446,7 +3260,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3479,7 +3293,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3792,7 +3606,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4041,7 +3855,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4069,7 +3883,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4093,7 +3907,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4123,7 +3937,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_NEON",
@@ -4141,7 +3955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4159,7 +3973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_NEON",
@@ -4177,7 +3991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4204,7 +4018,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4222,7 +4036,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4249,7 +4063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4288,112 +4102,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ400",
-   "linker_set_key" : "ABGRToJ400",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ420",
-   "linker_set_key" : "ABGRToJ420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ422",
-   "linker_set_key" : "ABGRToJ422",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4426,7 +4135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4459,79 +4168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_Any_NEON",
-   "linker_set_key" : "ABGRToUVJRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_C",
-   "linker_set_key" : "ABGRToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToUVJRow_NEON",
-   "linker_set_key" : "ABGRToUVJRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_NEON",
@@ -4555,7 +4192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -4579,7 +4216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_NEON",
@@ -4603,61 +4240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_Any_NEON",
-   "linker_set_key" : "ABGRToYJRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_C",
-   "linker_set_key" : "ABGRToYJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToYJRow_NEON",
-   "linker_set_key" : "ABGRToYJRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_NEON",
@@ -4675,7 +4258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -4693,7 +4276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_NEON",
@@ -4711,7 +4294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -4738,7 +4321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -4756,7 +4339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -4783,7 +4366,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -4801,7 +4384,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -4828,7 +4411,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -4846,7 +4429,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -4876,7 +4459,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -4897,7 +4480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -4924,7 +4507,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -4951,7 +4534,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_NEON",
@@ -4969,7 +4552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -4987,7 +4570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_NEON",
@@ -5005,7 +4588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -5032,7 +4615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_NEON",
@@ -5050,7 +4633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -5068,7 +4651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_NEON",
@@ -5086,7 +4669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -5125,7 +4708,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_Any_NEON",
@@ -5149,7 +4732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -5173,7 +4756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_NEON",
@@ -5197,7 +4780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_Any_NEON",
@@ -5215,7 +4798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -5233,7 +4816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_NEON",
@@ -5251,7 +4834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -5278,7 +4861,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_NEON",
@@ -5296,7 +4879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -5314,7 +4897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_NEON",
@@ -5332,7 +4915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -5371,7 +4954,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_Any_NEON",
@@ -5395,7 +4978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5419,7 +5002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_NEON",
@@ -5443,7 +5026,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_Any_NEON",
@@ -5461,7 +5044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5479,7 +5062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_NEON",
@@ -5497,7 +5080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5530,7 +5113,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_NEON",
@@ -5551,7 +5134,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5572,7 +5155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_NEON",
@@ -5593,7 +5176,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5617,7 +5200,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -5644,7 +5227,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_NEON",
@@ -5662,7 +5245,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -5680,7 +5263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_NEON",
@@ -5698,7 +5281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -5731,7 +5314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -5752,7 +5335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_NEON",
@@ -5773,7 +5356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -5809,7 +5392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -5839,7 +5422,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -5860,7 +5443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_NEON",
@@ -5881,7 +5464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -5911,7 +5494,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -5929,7 +5512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -5956,7 +5539,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -5983,7 +5566,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6010,7 +5593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -6028,7 +5611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -6055,7 +5638,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -6073,7 +5656,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -6094,7 +5677,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -6121,7 +5704,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_NEON",
@@ -6139,7 +5722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -6157,7 +5740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_NEON",
@@ -6175,7 +5758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -6202,7 +5785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -6220,7 +5803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_NEON",
@@ -6238,7 +5821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -6265,7 +5848,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -6301,7 +5884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -6331,7 +5914,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -6355,7 +5938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -6382,7 +5965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_NEON",
@@ -6400,7 +5983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -6418,7 +6001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_NEON",
@@ -6436,7 +6019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -6469,7 +6052,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_NEON",
@@ -6490,7 +6073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -6511,7 +6094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_NEON",
@@ -6532,7 +6115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -6562,7 +6145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -6583,7 +6166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -6619,7 +6202,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -6643,7 +6226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_NEON",
@@ -6667,7 +6250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -6697,37 +6280,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBRotate",
-   "linker_set_key" : "ARGBRotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -6754,7 +6307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -6769,7 +6322,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_NEON",
@@ -6784,7 +6337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_Any_NEON",
@@ -6802,7 +6355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -6820,7 +6373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_NEON",
@@ -6838,7 +6391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -6868,7 +6421,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -6889,7 +6442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_NEON",
@@ -6910,7 +6463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -6940,7 +6493,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_NEON",
@@ -6961,7 +6514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -6982,7 +6535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_NEON",
@@ -7003,7 +6556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -7030,7 +6583,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -7057,7 +6610,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -7084,7 +6637,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -7117,7 +6670,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_NEON",
@@ -7138,7 +6691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -7159,7 +6712,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_NEON",
@@ -7180,7 +6733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -7207,7 +6760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_NEON",
@@ -7225,7 +6778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -7243,7 +6796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_NEON",
@@ -7261,34 +6814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToABGR",
-   "linker_set_key" : "ARGBToABGR",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -7315,7 +6841,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -7333,7 +6859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -7360,7 +6886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_NEON",
@@ -7378,7 +6904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -7396,7 +6922,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_NEON",
@@ -7414,7 +6940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -7441,7 +6967,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_NEON",
@@ -7459,7 +6985,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -7477,7 +7003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_NEON",
@@ -7495,7 +7021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -7522,7 +7048,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_NEON",
@@ -7540,7 +7066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -7558,7 +7084,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_NEON",
@@ -7576,34 +7102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToBGRA",
-   "linker_set_key" : "ARGBToBGRA",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -7630,7 +7129,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -7669,52 +7168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToI420Alpha",
-   "linker_set_key" : "ARGBToI420Alpha",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -7753,7 +7207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -7792,7 +7246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -7819,7 +7273,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -7858,7 +7312,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -7897,7 +7351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -7930,7 +7384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -7963,7 +7417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -7990,7 +7444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_NEON",
@@ -8008,7 +7462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -8026,7 +7480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_NEON",
@@ -8044,7 +7498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -8071,7 +7525,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_NEON",
@@ -8089,7 +7543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -8107,7 +7561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_NEON",
@@ -8125,7 +7579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -8152,7 +7606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -8182,7 +7636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_NEON",
@@ -8203,7 +7657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -8217,14 +7671,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_NEON",
@@ -8238,14 +7692,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_NEON",
@@ -8263,7 +7717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -8281,7 +7735,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_NEON",
@@ -8299,7 +7753,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -8326,7 +7780,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_NEON",
@@ -8347,7 +7801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -8368,7 +7822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_NEON",
@@ -8389,7 +7843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_NEON",
@@ -8413,7 +7867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -8437,7 +7891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_NEON",
@@ -8461,7 +7915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_NEON",
@@ -8485,7 +7939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -8509,7 +7963,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_NEON",
@@ -8533,7 +7987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -8560,7 +8014,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_NEON",
@@ -8578,7 +8032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -8596,7 +8050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_NEON",
@@ -8614,7 +8068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_NEON",
@@ -8632,7 +8086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -8650,7 +8104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_NEON",
@@ -8668,7 +8122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -8695,7 +8149,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -8722,7 +8176,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -8740,7 +8194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -8773,7 +8227,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -8806,7 +8260,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_Any_NEON",
@@ -8827,7 +8281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -8848,7 +8302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_NEON",
@@ -8869,7 +8323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_Any_NEON",
@@ -8890,7 +8344,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -8911,7 +8365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_NEON",
@@ -8932,7 +8386,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_Any_NEON",
@@ -8950,7 +8404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -8968,7 +8422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_NEON",
@@ -8986,7 +8440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -9028,7 +8482,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -9070,7 +8524,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -9115,7 +8569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -9169,7 +8623,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -9226,7 +8680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -9238,7 +8692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -9265,7 +8719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -9304,7 +8758,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_NEON",
@@ -9328,7 +8782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -9352,7 +8806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_NEON",
@@ -9376,7 +8830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_NEON",
@@ -9394,7 +8848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -9412,7 +8866,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_NEON",
@@ -9430,7 +8884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -9469,7 +8923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -9493,7 +8947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -9514,7 +8968,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_Any_NEON",
@@ -9535,7 +8989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -9556,7 +9010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_NEON",
@@ -9577,7 +9031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -9604,7 +9058,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -9631,7 +9085,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -9643,7 +9097,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -9664,7 +9118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -9682,7 +9136,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -9700,7 +9154,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -9727,7 +9181,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -9757,7 +9211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_NEON",
@@ -9778,7 +9232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -9799,7 +9253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_NEON",
@@ -9820,7 +9274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -9850,7 +9304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -9871,7 +9325,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -9913,7 +9367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -9958,7 +9412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -10015,7 +9469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -10045,7 +9499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -10075,7 +9529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -10102,7 +9556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -10129,7 +9583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -10147,7 +9601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_NEON",
@@ -10165,7 +9619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -10183,7 +9637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_NEON",
@@ -10201,7 +9655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -10219,7 +9673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -10246,7 +9700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -10275,101 +9729,8 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetilePlane_16",
-   "linker_set_key" : "DetilePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_Any_NEON",
-   "linker_set_key" : "DetileRow_16_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_C",
-   "linker_set_key" : "DetileRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_NEON",
-   "linker_set_key" : "DetileRow_16_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_NEON",
@@ -10390,7 +9751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -10411,7 +9772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_NEON",
@@ -10432,7 +9793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -10468,7 +9829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_NEON",
@@ -10492,7 +9853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -10516,7 +9877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_NEON",
@@ -10540,124 +9901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2",
-   "linker_set_key" : "DetileToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_Any_NEON",
-   "linker_set_key" : "DetileToYUY2_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_C",
-   "linker_set_key" : "DetileToYUY2_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_NEON",
-   "linker_set_key" : "DetileToYUY2_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_NEON",
@@ -10678,7 +9922,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -10699,7 +9943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_NEON",
@@ -10720,7 +9964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -10735,7 +9979,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -10750,37 +9994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::GaussCol_C",
-   "linker_set_key" : "GaussCol_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -10810,7 +10024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -10837,25 +10051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::GaussRow_C",
-   "linker_set_key" : "GaussRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKj"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -10873,13 +10069,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -10918,7 +10114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -10957,7 +10153,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -10996,7 +10192,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -11035,7 +10231,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -11074,7 +10270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -11113,7 +10309,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -11152,7 +10348,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -11191,7 +10387,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -11230,7 +10426,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -11269,7 +10465,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -11308,7 +10504,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -11347,7 +10543,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -11386,7 +10582,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -11425,7 +10621,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -11464,7 +10660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -11503,7 +10699,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -11542,7 +10738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -11581,7 +10777,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -11620,7 +10816,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_Any_NEON",
@@ -11641,7 +10837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_NEON",
@@ -11662,7 +10858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -11692,7 +10888,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_NEON",
@@ -11713,7 +10909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -11734,7 +10930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_NEON",
@@ -11755,7 +10951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -11788,7 +10984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -11815,7 +11011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_NEON",
@@ -11842,7 +11038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -11860,7 +11056,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_NEON",
@@ -11878,7 +11074,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -11896,7 +11092,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -11914,7 +11110,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -11965,7 +11161,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -12019,7 +11215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -12070,61 +11266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I010Rotate",
-   "linker_set_key" : "I010Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -12163,7 +11305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -12202,7 +11344,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -12241,7 +11383,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -12283,7 +11425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -12328,7 +11470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -12367,7 +11509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -12409,7 +11551,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -12454,7 +11596,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -12505,7 +11647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -12556,7 +11698,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -12601,7 +11743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -12643,7 +11785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -12685,7 +11827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -12736,7 +11878,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -12781,7 +11923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -12832,7 +11974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -12886,7 +12028,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -12916,7 +12058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -12967,61 +12109,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I210Rotate",
-   "linker_set_key" : "I210Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -13060,7 +12148,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -13099,7 +12187,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -13138,7 +12226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -13180,7 +12268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -13225,7 +12313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -13252,7 +12340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -13291,7 +12379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -13333,7 +12421,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -13378,7 +12466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -13405,7 +12493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -13456,7 +12544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -13507,7 +12595,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -13558,7 +12646,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -13609,7 +12697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -13654,7 +12742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -13681,7 +12769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -13708,58 +12796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I212ToI420",
-   "linker_set_key" : "I212ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -13810,7 +12847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -13855,7 +12892,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -13882,7 +12919,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -13909,7 +12946,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -13936,7 +12973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -13966,7 +13003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_NEON",
@@ -13987,7 +13024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -14008,7 +13045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_NEON",
@@ -14029,7 +13066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -14056,7 +13093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -14095,7 +13132,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -14128,7 +13165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -14179,7 +13216,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -14209,112 +13246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I410Copy",
-   "linker_set_key" : "I410Copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I410Rotate",
-   "linker_set_key" : "I410Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -14356,7 +13288,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -14383,7 +13315,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -14425,7 +13357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -14452,7 +13384,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -14503,58 +13435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I410ToI420",
-   "linker_set_key" : "I410ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -14605,58 +13486,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I412ToI420",
-   "linker_set_key" : "I412ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -14707,7 +13537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -14755,7 +13585,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -14803,7 +13633,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -14854,7 +13684,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -14908,7 +13738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -14983,7 +13813,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -15034,7 +13864,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -15106,7 +13936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -15157,7 +13987,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -15208,7 +14038,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -15256,7 +14086,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -15310,7 +14140,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -15370,7 +14200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -15430,7 +14260,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -15490,7 +14320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -15541,7 +14371,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -15580,7 +14410,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -15619,7 +14449,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -15658,7 +14488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -15700,7 +14530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -15739,7 +14569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -15778,7 +14608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -15817,7 +14647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -15859,7 +14689,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -15904,7 +14734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -15943,7 +14773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -15994,7 +14824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -16045,7 +14875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -16084,7 +14914,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -16135,7 +14965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -16186,7 +15016,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -16231,7 +15061,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -16276,7 +15106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -16315,7 +15145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -16354,7 +15184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -16396,52 +15226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I420ToRGB24MatrixFilter",
-   "linker_set_key" : "I420ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -16480,7 +15265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -16522,7 +15307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -16564,7 +15349,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -16603,7 +15388,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -16645,7 +15430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -16684,7 +15469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -16723,7 +15508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -16771,7 +15556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -16819,7 +15604,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -16870,7 +15655,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -16924,7 +15709,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_NEON",
@@ -16954,7 +15739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -16984,7 +15769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_NEON",
@@ -17014,7 +15799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -17065,7 +15850,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -17119,7 +15904,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -17179,7 +15964,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -17239,7 +16024,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -17299,7 +16084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -17338,7 +16123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -17365,7 +16150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -17404,7 +16189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_NEON",
@@ -17431,7 +16216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -17458,7 +16243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_NEON",
@@ -17485,7 +16270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_NEON",
@@ -17512,7 +16297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -17539,7 +16324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_NEON",
@@ -17566,7 +16351,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -17608,7 +16393,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -17653,7 +16438,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_NEON",
@@ -17680,7 +16465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -17707,7 +16492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_NEON",
@@ -17734,7 +16519,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -17773,7 +16558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -17824,7 +16609,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -17875,7 +16660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -17926,7 +16711,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -17971,172 +16756,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRAW",
-   "linker_set_key" : "I422ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24",
-   "linker_set_key" : "I422ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24Matrix",
-   "linker_set_key" : "I422ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24MatrixFilter",
-   "linker_set_key" : "I422ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_NEON",
@@ -18163,7 +16783,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -18190,7 +16810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_NEON",
@@ -18217,7 +16837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -18256,49 +16876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB565Matrix",
-   "linker_set_key" : "I422ToRGB565Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_NEON",
@@ -18325,7 +16903,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -18352,7 +16930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_NEON",
@@ -18379,7 +16957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -18418,7 +16996,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -18460,7 +17038,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_NEON",
@@ -18487,7 +17065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -18514,7 +17092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_NEON",
@@ -18541,7 +17119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -18580,7 +17158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_NEON",
@@ -18604,7 +17182,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -18628,7 +17206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_NEON",
@@ -18652,7 +17230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -18691,7 +17269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_NEON",
@@ -18715,7 +17293,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -18739,7 +17317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_NEON",
@@ -18763,7 +17341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -18811,7 +17389,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -18859,7 +17437,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -18910,7 +17488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_NEON",
@@ -18940,7 +17518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -18970,7 +17548,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_NEON",
@@ -19000,7 +17578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -19051,7 +17629,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -19105,7 +17683,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -19165,7 +17743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -19225,7 +17803,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -19285,7 +17863,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -19324,7 +17902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -19363,7 +17941,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -19405,7 +17983,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_NEON",
@@ -19432,7 +18010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -19459,7 +18037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_NEON",
@@ -19486,7 +18064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -19537,7 +18115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -19582,7 +18160,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -19627,214 +18205,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRAW",
-   "linker_set_key" : "I444ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24",
-   "linker_set_key" : "I444ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Matrix",
-   "linker_set_key" : "I444ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_Any_NEON",
-   "linker_set_key" : "I444ToRGB24Row_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_C",
-   "linker_set_key" : "I444ToRGB24Row_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_NEON",
-   "linker_set_key" : "I444ToRGB24Row_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -19870,7 +18247,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -19906,7 +18283,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -19933,7 +18310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_Any_NEON",
@@ -19957,7 +18334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -19981,7 +18358,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_NEON",
@@ -20005,7 +18382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_NEON",
@@ -20029,7 +18406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -20053,7 +18430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_NEON",
@@ -20077,7 +18454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -20104,7 +18481,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_NEON",
@@ -20122,7 +18499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -20140,7 +18517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_NEON",
@@ -20158,7 +18535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -20197,7 +18574,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -20236,7 +18613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -20275,7 +18652,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -20314,7 +18691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -20353,7 +18730,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -20392,7 +18769,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -20431,7 +18808,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -20470,7 +18847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -20509,7 +18886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -20530,7 +18907,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -20563,7 +18940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -20608,7 +18985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -20647,7 +19024,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -20686,7 +19063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -20731,7 +19108,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -20770,79 +19147,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MM21ToYUY2",
-   "linker_set_key" : "MM21ToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MT2TToP010",
-   "linker_set_key" : "MT2TToP010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -20854,7 +19159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -20902,7 +19207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_NEON",
@@ -20932,7 +19237,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -20962,7 +19267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_NEON",
@@ -20992,7 +19297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -21040,7 +19345,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_NEON",
@@ -21070,7 +19375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -21100,7 +19405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_NEON",
@@ -21130,7 +19435,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -21175,7 +19480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_NEON",
@@ -21202,7 +19507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -21229,7 +19534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_NEON",
@@ -21256,7 +19561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -21295,7 +19600,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -21319,7 +19624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_NEON",
@@ -21343,7 +19648,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -21376,7 +19681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -21412,7 +19717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_NEON",
@@ -21436,7 +19741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -21460,7 +19765,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_NEON",
@@ -21484,7 +19789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_NEON",
@@ -21505,7 +19810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -21526,7 +19831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_NEON",
@@ -21547,7 +19852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -21589,7 +19894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_Any_NEON",
@@ -21616,7 +19921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_NEON",
@@ -21643,7 +19948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_NEON",
@@ -21670,7 +19975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -21697,7 +20002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_NEON",
@@ -21724,7 +20029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_NEON",
@@ -21751,7 +20056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -21778,7 +20083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_NEON",
@@ -21805,7 +20110,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_NEON",
@@ -21832,7 +20137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -21859,7 +20164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_NEON",
@@ -21886,7 +20191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_NEON",
@@ -21910,7 +20215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -21934,7 +20239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_NEON",
@@ -21958,7 +20263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -21970,7 +20275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -21997,25 +20302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::MirrorRow_16_C",
-   "linker_set_key" : "MirrorRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_NEON",
@@ -22033,7 +20320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -22051,7 +20338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_NEON",
@@ -22069,7 +20356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -22090,7 +20377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_NEON",
@@ -22111,7 +20398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -22138,7 +20425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_NEON",
@@ -22156,7 +20443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -22174,7 +20461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_NEON",
@@ -22192,7 +20479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_NEON",
@@ -22213,7 +20500,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -22234,7 +20521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_NEON",
@@ -22255,7 +20542,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -22294,7 +20581,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -22333,7 +20620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -22381,7 +20668,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -22414,7 +20701,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -22447,7 +20734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -22483,7 +20770,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_NEON",
@@ -22507,7 +20794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -22531,7 +20818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_NEON",
@@ -22555,7 +20842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -22600,7 +20887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -22648,7 +20935,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -22687,7 +20974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -22720,7 +21007,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -22753,7 +21040,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -22789,7 +21076,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_NEON",
@@ -22813,7 +21100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -22837,7 +21124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_NEON",
@@ -22861,7 +21148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -22894,7 +21181,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -22930,7 +21217,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_NEON",
@@ -22954,7 +21241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -22978,7 +21265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_NEON",
@@ -23002,7 +21289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -23041,7 +21328,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -23080,7 +21367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -23113,7 +21400,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -23146,7 +21433,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -23182,7 +21469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_NEON",
@@ -23206,7 +21493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -23230,7 +21517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_NEON",
@@ -23254,7 +21541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -23299,7 +21586,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -23338,7 +21625,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -23371,7 +21658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -23404,7 +21691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -23440,7 +21727,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_NEON",
@@ -23464,7 +21751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -23488,7 +21775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_NEON",
@@ -23512,7 +21799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -23545,7 +21832,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_NEON",
@@ -23566,7 +21853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -23587,7 +21874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_NEON",
@@ -23608,7 +21895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -23644,7 +21931,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -23683,7 +21970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -23719,7 +22006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -23758,52 +22045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::P010ToI010",
-   "linker_set_key" : "P010ToI010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -23842,52 +22084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::P012ToI012",
-   "linker_set_key" : "P012ToI012",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -23923,7 +22120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -23962,7 +22159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -23986,7 +22183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -24022,7 +22219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -24061,7 +22258,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -24085,7 +22282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -24124,7 +22321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -24148,7 +22345,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -24172,7 +22369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -24199,7 +22396,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_NEON",
@@ -24217,7 +22414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -24235,7 +22432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_NEON",
@@ -24253,7 +22450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -24292,7 +22489,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -24319,7 +22516,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -24358,7 +22555,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -24391,7 +22588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -24418,7 +22615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_NEON",
@@ -24436,7 +22633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -24454,7 +22651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_NEON",
@@ -24472,7 +22669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -24499,7 +22696,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_NEON",
@@ -24517,7 +22714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -24535,7 +22732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_NEON",
@@ -24553,7 +22750,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_Any_NEON",
@@ -24577,7 +22774,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -24601,7 +22798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_NEON",
@@ -24625,7 +22822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_Any_NEON",
@@ -24649,7 +22846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -24673,7 +22870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_NEON",
@@ -24697,7 +22894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_NEON",
@@ -24715,7 +22912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -24733,7 +22930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_NEON",
@@ -24751,7 +22948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_Any_NEON",
@@ -24769,7 +22966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -24787,7 +22984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_NEON",
@@ -24805,7 +23002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -24832,7 +23029,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_NEON",
@@ -24850,7 +23047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -24868,7 +23065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_NEON",
@@ -24886,7 +23083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -24913,7 +23110,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_NEON",
@@ -24931,7 +23128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -24949,7 +23146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_NEON",
@@ -24967,7 +23164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -25006,7 +23203,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -25033,7 +23230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -25072,7 +23269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_Any_NEON",
@@ -25096,7 +23293,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -25120,7 +23317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_NEON",
@@ -25144,7 +23341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_Any_NEON",
@@ -25168,7 +23365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -25192,7 +23389,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_NEON",
@@ -25216,7 +23413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_NEON",
@@ -25234,7 +23431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -25252,7 +23449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_NEON",
@@ -25270,7 +23467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_Any_NEON",
@@ -25288,7 +23485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -25306,7 +23503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_NEON",
@@ -25324,7 +23521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -25351,7 +23548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_NEON",
@@ -25369,7 +23566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -25387,7 +23584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_NEON",
@@ -25405,7 +23602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -25444,7 +23641,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_Any_NEON",
@@ -25468,7 +23665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -25492,7 +23689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_NEON",
@@ -25516,7 +23713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_Any_NEON",
@@ -25534,7 +23731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -25552,7 +23749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_NEON",
@@ -25570,7 +23767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -25597,7 +23794,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -25636,7 +23833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -25663,31 +23860,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::RGBAToUVJRow_C",
-   "linker_set_key" : "RGBAToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_NEON",
@@ -25711,7 +23884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -25735,7 +23908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_NEON",
@@ -25759,7 +23932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_NEON",
@@ -25777,7 +23950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -25795,7 +23968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_NEON",
@@ -25813,7 +23986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_NEON",
@@ -25831,7 +24004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -25849,7 +24022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_NEON",
@@ -25867,7 +24040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -25897,7 +24070,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -25927,7 +24100,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -25945,7 +24118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -25981,19 +24154,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_rgb.h"
-  },
-  {
-   "function_name" : "libyuv::RiscvCpuCaps",
-   "linker_set_key" : "RiscvCpuCaps",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -26023,7 +24184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -26050,7 +24211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -26077,7 +24238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -26104,37 +24265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
-  },
-  {
-   "function_name" : "libyuv::RotatePlane_16",
-   "linker_set_key" : "RotatePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -26194,7 +24325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -26218,7 +24349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -26242,7 +24373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_Any_NEON",
@@ -26266,7 +24397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -26290,7 +24421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -26314,7 +24445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_Any_NEON",
@@ -26338,7 +24469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -26362,7 +24493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_NEON",
@@ -26383,7 +24514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -26404,7 +24535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_NEON",
@@ -26425,7 +24556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -26446,7 +24577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_NEON",
@@ -26467,7 +24598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -26488,7 +24619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_NEON",
@@ -26512,7 +24643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -26536,7 +24667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_NEON",
@@ -26560,7 +24691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -26584,7 +24715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -26602,7 +24733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_NEON",
@@ -26620,7 +24751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -26638,7 +24769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -26662,7 +24793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -26686,7 +24817,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -26710,7 +24841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -26734,7 +24865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -26758,7 +24889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -26782,7 +24913,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -26806,7 +24937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_Any_NEON",
@@ -26830,7 +24961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -26854,7 +24985,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -26878,7 +25009,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -26899,7 +25030,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -26935,46 +25066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScalePlaneDown2_16To8",
-   "linker_set_key" : "ScalePlaneDown2_16To8",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -27019,7 +25111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -27064,7 +25156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -27112,7 +25204,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -27148,7 +25240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -27184,55 +25276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -27253,7 +25297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_NEON",
@@ -27274,7 +25318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -27295,7 +25339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -27316,7 +25360,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_NEON",
@@ -27337,55 +25381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -27406,7 +25402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_NEON",
@@ -27427,7 +25423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -27448,55 +25444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -27517,7 +25465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_NEON",
@@ -27538,7 +25486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -27559,7 +25507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -27580,7 +25528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_NEON",
@@ -27601,7 +25549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -27622,7 +25570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -27643,7 +25591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -27664,7 +25612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_NEON",
@@ -27685,7 +25633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -27706,7 +25654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_NEON",
@@ -27727,7 +25675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -27748,7 +25696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -27769,7 +25717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -27790,7 +25738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_NEON",
@@ -27811,7 +25759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -27832,7 +25780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -27853,7 +25801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_NEON",
@@ -27874,7 +25822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -27895,7 +25843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_NEON",
@@ -27916,7 +25864,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -27937,7 +25885,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -27958,7 +25906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_NEON",
@@ -27979,7 +25927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -28000,7 +25948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -28021,7 +25969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_NEON",
@@ -28042,7 +25990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -28063,7 +26011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_NEON",
@@ -28087,7 +26035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -28111,7 +26059,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_NEON",
@@ -28135,7 +26083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -28159,7 +26107,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -28183,7 +26131,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_NEON",
@@ -28207,7 +26155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -28231,7 +26179,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_NEON",
@@ -28249,7 +26197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -28267,7 +26215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_NEON",
@@ -28285,7 +26233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -28303,7 +26251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -28321,7 +26269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_NEON",
@@ -28339,7 +26287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -28357,7 +26305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -28378,7 +26326,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -28414,7 +26362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -28435,7 +26383,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -28459,7 +26407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -28483,7 +26431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -28507,7 +26455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -28531,7 +26479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -28555,7 +26503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_NEON",
@@ -28576,7 +26524,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -28597,28 +26545,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2Linear_Any_NEON",
-   "linker_set_key" : "ScaleUVRowDown2Linear_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -28639,28 +26566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleUVRowDown2_Any_NEON",
-   "linker_set_key" : "ScaleUVRowDown2_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -28681,7 +26587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -28705,7 +26611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_Any_NEON",
@@ -28729,7 +26635,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -28753,7 +26659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -28777,7 +26683,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_NEON",
@@ -28801,7 +26707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -28825,7 +26731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -28849,7 +26755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_NEON",
@@ -28873,7 +26779,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -28897,7 +26803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -28915,7 +26821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_NEON",
@@ -28933,7 +26839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -28951,7 +26857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -28969,7 +26875,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_NEON",
@@ -28987,7 +26893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -29005,7 +26911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -29029,7 +26935,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_NEON",
@@ -29047,7 +26953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -29065,7 +26971,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_NEON",
@@ -29083,7 +26989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_NEON",
@@ -29104,7 +27010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -29125,7 +27031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_NEON",
@@ -29146,7 +27052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_NEON",
@@ -29167,7 +27073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -29188,7 +27094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_NEON",
@@ -29209,7 +27115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -29233,7 +27139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_NEON",
@@ -29257,7 +27163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_NEON",
@@ -29278,7 +27184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -29299,7 +27205,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_NEON",
@@ -29320,7 +27226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -29341,7 +27247,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_NEON",
@@ -29362,7 +27268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -29407,7 +27313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_NEON",
@@ -29434,7 +27340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -29461,7 +27367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_NEON",
@@ -29488,7 +27394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -29527,7 +27433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_NEON",
@@ -29551,7 +27457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -29575,7 +27481,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_NEON",
@@ -29599,7 +27505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -29635,7 +27541,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -29668,7 +27574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -29701,7 +27607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -29734,7 +27640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -29767,7 +27673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -29800,7 +27706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -29836,7 +27742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_NEON",
@@ -29860,7 +27766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -29884,7 +27790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_NEON",
@@ -29908,7 +27814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_NEON",
@@ -29929,7 +27835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -29950,7 +27856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_NEON",
@@ -29971,7 +27877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_NEON",
@@ -29995,7 +27901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -30019,7 +27925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_NEON",
@@ -30043,7 +27949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -30058,7 +27964,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -30076,7 +27982,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_NEON",
@@ -30094,7 +28000,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -30121,7 +28027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_NEON",
@@ -30139,7 +28045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -30157,7 +28063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_NEON",
@@ -30175,55 +28081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::Transpose4x4_32_C",
-   "linker_set_key" : "Transpose4x4_32_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::Transpose4x4_32_NEON",
-   "linker_set_key" : "Transpose4x4_32_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -30250,7 +28108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_NEON",
@@ -30280,7 +28138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -30310,7 +28168,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_NEON",
@@ -30340,7 +28198,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -30373,31 +28231,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWx8_16_C",
-   "linker_set_key" : "TransposeWx8_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_NEON",
@@ -30421,7 +28255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -30445,7 +28279,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_NEON",
@@ -30469,34 +28303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWxH_16_C",
-   "linker_set_key" : "TransposeWxH_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -30523,7 +28330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -30562,7 +28369,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -30601,7 +28408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -30640,7 +28447,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -30679,7 +28486,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -30718,7 +28525,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -30757,7 +28564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -30796,7 +28603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -30835,7 +28642,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -30874,7 +28681,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -30913,7 +28720,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -30952,7 +28759,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -30991,7 +28798,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -31030,7 +28837,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -31069,7 +28876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -31096,7 +28903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_NEON",
@@ -31117,7 +28924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -31138,7 +28945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_NEON",
@@ -31159,7 +28966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -31198,7 +29005,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -31237,7 +29044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -31270,7 +29077,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_NEON",
@@ -31291,7 +29098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -31312,7 +29119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_NEON",
@@ -31333,7 +29140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_NEON",
@@ -31357,7 +29164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -31381,7 +29188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_NEON",
@@ -31405,7 +29212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -31432,7 +29239,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_NEON",
@@ -31450,7 +29257,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -31468,7 +29275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_NEON",
@@ -31486,43 +29293,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_C",
-   "linker_set_key" : "UnpackMT2T_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_NEON",
-   "linker_set_key" : "UnpackMT2T_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -31537,7 +29308,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -31564,7 +29335,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_NEON",
@@ -31585,7 +29356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -31606,7 +29377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_NEON",
@@ -31627,7 +29398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -31666,7 +29437,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -31705,7 +29476,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -31738,70 +29509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_Any_NEON",
-   "linker_set_key" : "YUY2ToNVUVRow_Any_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_C",
-   "linker_set_key" : "YUY2ToNVUVRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::YUY2ToNVUVRow_NEON",
-   "linker_set_key" : "YUY2ToNVUVRow_NEON",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_NEON",
@@ -31822,7 +29530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -31843,7 +29551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_NEON",
@@ -31864,7 +29572,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_NEON",
@@ -31888,7 +29596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -31912,7 +29620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_NEON",
@@ -31936,7 +29644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -31963,7 +29671,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_NEON",
@@ -31981,7 +29689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -31999,7 +29707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_NEON",
@@ -32017,7 +29725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -32031,7 +29739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -32044,7 +29752,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32058,7 +29766,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -32071,7 +29779,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -32093,7 +29801,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -32118,7 +29826,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -32134,7 +29842,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -32147,7 +29855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -32163,7 +29871,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -32179,7 +29887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32196,7 +29904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -32212,7 +29920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -32228,7 +29936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -32244,7 +29952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32261,7 +29969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -32275,7 +29983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -32291,7 +29999,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -32307,7 +30015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -32325,7 +30033,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -32338,7 +30046,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -32354,7 +30062,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -32367,7 +30075,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -32380,7 +30088,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -32399,7 +30107,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -32412,7 +30120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -32425,7 +30133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -32438,7 +30146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -32451,7 +30159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -32460,121 +30168,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -32587,7 +30295,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32596,7 +30304,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32605,7 +30313,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32614,7 +30322,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32623,7 +30331,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -32632,7 +30340,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32641,7 +30349,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32650,7 +30358,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -32659,7 +30367,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32668,7 +30376,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -32677,16 +30385,7 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKj",
-   "name" : "const unsigned int *",
-   "referenced_type" : "_ZTIKj",
-   "self_type" : "_ZTIPKj",
-   "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32695,7 +30394,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -32704,7 +30403,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32713,7 +30412,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32722,7 +30421,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32731,7 +30430,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32740,7 +30439,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32749,7 +30448,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -32758,7 +30457,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -32767,7 +30466,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -32776,7 +30475,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "alignment" : 4,
@@ -32785,7 +30484,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -32794,7 +30493,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -32807,7 +30506,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 16,
@@ -32817,7 +30516,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -32827,7 +30526,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -32837,7 +30536,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -32847,7 +30546,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -32857,7 +30556,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -32867,7 +30566,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -32877,7 +30576,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -32887,7 +30586,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -32897,7 +30596,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -32926,7 +30625,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -33004,7 +30703,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 16,
@@ -33025,7 +30724,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -33046,7 +30745,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []